From 224fd5fa29e43c5b2543ab791de5f46abe1ae8a7 Mon Sep 17 00:00:00 2001 From: Matthias Q <35303817+matthias-Q@users.noreply.github.com> Date: Fri, 28 Jul 2023 23:01:06 +0200 Subject: [PATCH] feat: update prql parser (#7771) --- languages.toml | 2 +- runtime/queries/prql/highlights.scm | 31 ++++++++++++++++++----------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/languages.toml b/languages.toml index 2f7e034b..54ce05b5 100644 --- a/languages.toml +++ b/languages.toml @@ -2460,7 +2460,7 @@ indent = { tab-width = 4, unit = " " } [[grammar]] name = "prql" -source = { git = "https://github.com/PRQL/tree-sitter-prql", rev = "3f27cac466f030ee7d985d91eba5470e01dd21ea" } +source = { git = "https://github.com/PRQL/tree-sitter-prql", rev = "09e158cd3650581c0af4c49c2e5b10c4834c8646" } [[language]] name = "po" diff --git a/runtime/queries/prql/highlights.scm b/runtime/queries/prql/highlights.scm index 5cfedee4..8b67487b 100644 --- a/runtime/queries/prql/highlights.scm +++ b/runtime/queries/prql/highlights.scm @@ -9,7 +9,7 @@ (keyword_window) (keyword_join) (keyword_select) - (keyword_switch) + (keyword_case) (keyword_append) (keyword_remove) (keyword_intersect) @@ -19,6 +19,7 @@ (keyword_let) (keyword_prql) (keyword_from_text) + (keyword_loop) ] @keyword (literal) @string @@ -33,8 +34,6 @@ alias: (identifier) @variable.other.member (comment) @comment -(keyword_func) @keyword.function - (function_call (identifier) @function) @@ -50,21 +49,25 @@ alias: (identifier) @variable.other.member "!=" ">=" ">" - "->" + "&&" + "||" + "//" + "~=" (bang) ] @operator [ "(" ")" - "[" - "]" + "{" + "}" ] @punctuation.bracket [ "," "." (pipe) + "->" ] @punctuation.delimiter (literal @@ -87,6 +90,15 @@ alias: (identifier) @variable.other.member (keyword_sum) (keyword_stddev) (keyword_count) + (keyword_lag) + (keyword_lead) + (keyword_first) + (keyword_last) + (keyword_rank) + (keyword_row_number) + (keyword_round) + (keyword_all) + (keyword_map) ] @function [ @@ -119,13 +131,8 @@ alias: (identifier) @variable.other.member (keyword_false) ] @constant.builtin.boolean -[ - (keyword_and) - (keyword_or) -] @keyword.operator - (function_definition - (keyword_func) + (keyword_let) name: (identifier) @function) (parameter