Reverse query precedence ordering

helix-core/src/syntax.rs

@@ -2475,15 +2475,17 @@ impl<'a> Iterator for HighlightIter<'a> {
                 }
             }
 
-            // Once a highlighting pattern is found for the current node, skip over
-            // any later highlighting patterns that also match this node. Captures
+            // Use the last capture found for the current node, skipping over any
+            // highlight patterns that also match this node. Captures
             // for a given node are ordered by pattern index, so these subsequent
             // captures are guaranteed to be for highlighting, not injections or
             // local variables.
             while let Some((next_match, next_capture_index)) = captures.peek() {
                 let next_capture = next_match.captures[*next_capture_index];
                 if next_capture.node == capture.node {
-                    captures.next();
+                    match_.remove();
+                    capture = next_capture;
+                    match_ = captures.next().unwrap().0;
                 } else {
                     break;
                 }

languages.toml

@@ -1115,7 +1115,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
 name = "julia"
-source = { git = "https://github.com/tree-sitter/tree-sitter-julia", rev = "8fb38abff74652c4faddbf04d2d5bbbc6b4bae25" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-julia", rev = "e84f10db8eeb8b9807786bfc658808edaa1b4fa2" }
 
 [[language]]
 name = "java"

runtime/queries/awk/highlights.scm

@@ -109,14 +109,15 @@
 (number) @constant.numeric
 (string) @string
 
-(func_call name: (identifier) @function)
-(func_def name: (identifier) @function)
-
-(field_ref (_) @variable)
 [
   (identifier)
   (field_ref)
 ] @variable
 
+(func_call name: (identifier) @function)
+(func_def name: (identifier) @function)
+
+(field_ref (_) @variable)
+
 (ns_qualified_name "::" @operator)
 (ns_qualified_name (namespace) @namespace)

runtime/queries/bash/highlights.scm

@@ -7,7 +7,10 @@
 
 (command_name) @function
 
-(variable_name) @variable.other.member
+(variable_name) @variable
+
+((variable_name) @constant
+  (#match? @constant "^[A-Z][A-Z_0-9]*$"))
 
 [
   "if"
@@ -43,6 +46,9 @@
 
 (comment) @comment
 
+((word) @constant.builtin.boolean
+  (#any-of? @constant.builtin.boolean "true" "false"))
+
 (function_definition name: (word) @function)
 
 (file_descriptor) @constant.numeric.integer
@@ -51,7 +57,7 @@
   (command_substitution)
   (process_substitution)
   (expansion)
-]@embedded
+] @embedded
 
 [
   "$"

runtime/queries/c/highlights.scm

@@ -1,3 +1,9 @@
+
+(identifier) @variable
+
+((identifier) @constant
+  (#match? @constant "^[A-Z][A-Z\\d_]*$"))
+
 "sizeof" @keyword
 
 [
@@ -109,6 +115,12 @@
 (char_literal) @constant.character
 (escape_sequence) @constant.character.escape
 
+(field_identifier) @variable.other.member
+(statement_identifier) @label
+(type_identifier) @type
+(primitive_type) @type.builtin
+(sized_type_specifier) @type.builtin
+
 (call_expression
   function: (identifier) @function)
 (call_expression
@@ -128,15 +140,4 @@
 (attribute
   name: (identifier) @attribute)
 
-(field_identifier) @variable.other.member
-(statement_identifier) @label
-(type_identifier) @type
-(primitive_type) @type.builtin
-(sized_type_specifier) @type.builtin
-
-((identifier) @constant
-  (#match? @constant "^[A-Z][A-Z\\d_]*$"))
-
-(identifier) @variable
-
 (comment) @comment

runtime/queries/capnp/highlights.scm

@@ -1,14 +1,17 @@
 ; Preproc
 
-(unique_id) @keyword.directive
-(top_level_annotation_body) @keyword.directive
+[
+  (unique_id)
+  (top_level_annotation_body)
+] @keyword.directive
 
 ; Includes
 
 [
   "import"
   "$import"
   "embed"
+  "using"
 ] @keyword.control.import
 
 (import_path) @string
@@ -84,10 +87,10 @@
   "union"
 ] @keyword.storage.type
 
+"extends" @keyword
+
 [
-  "extends"
   "namespace"
-  "using"
   (annotation_target)
 ] @special
 

runtime/queries/cel/highlights.scm

@@ -22,24 +22,24 @@
 "in"
 ] @keyword
 
-; Function calls
-
-(call_expression
-  function: (identifier) @function)
-
-(member_call_expression
-  function: (identifier) @function)
-
 ; Identifiers
 
+(identifier) @variable.other.member
+
 (select_expression
   operand: (identifier) @type)
 
 (select_expression
   operand: (select_expression
     member: (identifier) @type))
 
-(identifier) @variable.other.member
+; Function calls
+
+(call_expression
+  function: (identifier) @function)
+
+(member_call_expression
+  function: (identifier) @function)
 
 ; Literals
 

runtime/queries/clojure/highlights.scm

@@ -10,6 +10,14 @@
 
 (comment) @comment
 
+;; other symbols
+(sym_lit) @variable
+
+;; other calls
+(list_lit
+ .
+ (sym_lit) @function)
+
 ;; metadata experiment
 (meta_lit
  marker: "^" @punctuation)
@@ -61,20 +69,12 @@
 ((sym_lit) @operator
  (#match? @operator "^%"))
 
-;; other calls
-(list_lit
- .
- (sym_lit) @function)
-
 ;; interop-ish
 (list_lit
  .
  (sym_lit) @function.method
  (#match? @function.method "^\\."))
 
-;; other symbols
-(sym_lit) @variable
-
 ;; quote
 (quoting_lit) @constant.character.escape
 

runtime/queries/cpp/highlights.scm

@@ -1,3 +1,5 @@
+; inherits: c
+
 ; Functions
 
 ; These casts are parsed as function calls, but are not.
@@ -132,5 +134,3 @@
 ; Strings
 
 (raw_string_literal) @string
-
-; inherits: c

runtime/queries/cue/highlights.scm

@@ -1,6 +1,6 @@
 (package_clause "package" @keyword.control.import)
 
-(package_identifier) @variable
+(package_identifier) @namespace
 
 (import_declaration "import" @keyword.control.import)
 
@@ -25,7 +25,7 @@
   "/"
 ] @operator
 
-(unary_expression "*" @operator.default)
+(unary_expression "*" @operator)
 
 (unary_expression "=~" @operator.regexp)
 
@@ -95,16 +95,24 @@
 
 (interpolation "\\(" @punctuation.bracket (_) ")" @punctuation.bracket) @variable.other.member
 
-(field (label (identifier) @variable.other.member))
+(identifier) @variable
+
+; Types
+(primitive_type) @type.builtin
 
 (
   (identifier) @keyword.storage.type
   (#match? @keyword.storage.type "^#")
 )
 
-(field (label alias: (identifier) @label))
+[
+  (slice_type)
+  (pointer_type)
+] @type ; In attributes
 
-(let_clause left: (identifier) @label)
 
+(field (label (identifier) @variable.other.member))
+
+(field (label alias: (identifier) @label))
 
-(attribute (identifier) @tag)
+(attribute (identifier) @attribute)

runtime/queries/devicetree/highlights.scm

@@ -51,14 +51,14 @@
 
 (integer_literal) @constant.numeric.integer
 
+(identifier) @variable
+
 (call_expression
   function: (identifier) @function)
 
 (labeled_item
   label: (identifier) @label)
 
-(identifier) @variable
-
 (unit_address) @tag
 
 (reference) @constant

runtime/queries/dockerfile/highlights.scm

@@ -37,6 +37,15 @@
 
 (double_quoted_string) @string
 
+[
+  (heredoc_marker)
+  (heredoc_end)
+] @label
+
+((heredoc_block
+  (heredoc_line) @string)
+  (#set! "priority" 90))
+
 (expansion
   [
 	"$"
@@ -52,3 +61,6 @@
 	(param)
 	(mount_param)
 ] @constant
+
+(expose_instruction
+  (expose_port) @constant.numeric.integer)

runtime/queries/dot/highlights.scm

@@ -1,3 +1,5 @@
+(identifier) @variable
+
 (keyword) @keyword
 (string_literal) @string
 (number_literal) @constant.numeric
@@ -33,11 +35,9 @@
     (identifier) @constant)
 )
 
-[
-  (comment)
-  (preproc)
-] @comment
+(comment) @comment
+
+(preproc) @keyword.directive
 
 (ERROR) @error
 
-(identifier) @variable