From b2807559e35587e3c9dc0b82633f8b4b04705192 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Fri, 15 Apr 2022 10:30:46 +0200 Subject: julia: update queries to parser changes --- lockfile.json | 2 +- queries/julia/highlights.scm | 22 +++++++++++++--------- queries/julia/indents.scm | 3 +-- queries/julia/injections.scm | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/lockfile.json b/lockfile.json index 3ec955aa4..9f5ed65de 100644 --- a/lockfile.json +++ b/lockfile.json @@ -159,7 +159,7 @@ "revision": "02b01653c8a1c198ae7287d566efa86a135b30d5" }, "julia": { - "revision": "12ea597262125fc22fd2e91aa953ac69b19c26ca" + "revision": "71ecd1ec5786b2d3f4f9d4c97c397f0475ba4d47" }, "kotlin": { "revision": "a4f71eb9b8c9b19ded3e0e9470be4b1b77c2b569" diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm index a355367a5..7b12369ef 100644 --- a/queries/julia/highlights.scm +++ b/queries/julia/highlights.scm @@ -5,13 +5,14 @@ ((identifier) @constant (#match? @constant "^[A-Z][A-Z_]{2}[A-Z_]*$")) -[ - (triple_string) - (string) -] @string -(command_string) @string.special +(escape_sequence) @character.special +(character_literal) @character +(string_literal) @string +(command_literal) @string.special -(string +(prefixed_string_literal + prefix: (identifier) @constant.builtin) +(prefixed_command_literal prefix: (identifier) @constant.builtin) (macro_identifier) @function.macro @@ -89,7 +90,10 @@ (struct_definition name: (identifier) @type) -(number) @number +[ + (integer_literal) + (float_literal) +] @number (range_expression (identifier) @number (#eq? @number "end")) @@ -98,7 +102,7 @@ (identifier) @number (#eq? @number "end"))) (coefficient_expression - (number) + [(integer_literal) (float_literal)] (identifier) @constant.builtin) ;; TODO: operators. @@ -127,7 +131,7 @@ (function_definition ["function" "end"] @keyword.function) [ - (comment) + (line_comment) (block_comment) ] @comment diff --git a/queries/julia/indents.scm b/queries/julia/indents.scm index 3c87a05fb..e6423d342 100644 --- a/queries/julia/indents.scm +++ b/queries/julia/indents.scm @@ -35,8 +35,7 @@ ] @branch [ - (comment) + (line_comment) (block_comment) - (triple_string) ] @ignore diff --git a/queries/julia/injections.scm b/queries/julia/injections.scm index 77c503455..883300b1c 100644 --- a/queries/julia/injections.scm +++ b/queries/julia/injections.scm @@ -3,6 +3,6 @@ ; (#offset! @markdown 0 3 0 -3)) [ - (comment) + (line_comment) (block_comment) ] @comment -- cgit v1.2.3-70-g09d2