@dekobon/tree-sitter-groovy 0.4.0 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dekobon/tree-sitter-groovy",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Apache Groovy grammar for tree-sitter (dekobon fork)",
   "main": "bindings/node",
   "types": "bindings/node",

package/queries/groovy/highlights.scm

@@ -97,6 +97,8 @@
   ".@"
   "::"
   "*:"
+  "->"
+  "..."
 ] @operator
 
 ; -- Layer 3: generic identifier fallback --------------------------
@@ -112,10 +114,10 @@
   "instanceof"
 ] @keyword.operator
 
-; `!in` and `!instanceof` are composite tokens (literal + trailing
-; whitespace) per SPECIFICATION.md §3.2.2 lexer rule, so they
-; cannot be referenced as direct anonymous tokens in a `[ … ]`
-; group. Capture them through the operator field instead.
+; `!instanceof` is a composite token (literal + trailing whitespace)
+; per SPECIFICATION.md §3.2.2, so it cannot be referenced as a direct
+; anonymous token in a `[ … ]` group. Capture it, and `!in` with it,
+; through the operator field instead.
 (membership_expression operator: _ @keyword.operator)
 (instanceof_expression operator: _ @keyword.operator)
 
@@ -172,6 +174,10 @@
   "strictfp"
 ] @keyword.modifier
 
+; `synchronized (lock) { … }` is a statement; the word is a modifier
+; everywhere else.
+(synchronized_statement "synchronized" @keyword)
+
 (shebang) @keyword.directive
 
 ; -- Layer 5: dot-family property captures -------------------------

package/queries/groovy/locals.scm

@@ -8,6 +8,8 @@
 ; Scopes — anywhere a new symbol table is opened.
 [
   (class_body)
+  (enum_body)
+  (record_declaration)
   (block)
   (closure)
   (method_declaration)
@@ -16,12 +18,17 @@
   (for_statement)
   (for_in_statement)
   (catch_clause)
+  (try_statement)
 ] @local.scope
 
 ; Definitions — bound names introduced inside their enclosing scope.
 (formal_parameter name: (identifier) @local.definition.parameter)
 (closure_parameter name: (identifier) @local.definition.parameter)
 (variable_declarator name: (identifier) @local.definition.var)
+; A typed local has its name on the declaration itself, with no
+; `variable_declarator`: `String s = 'a'`, `final String s`.
+(local_variable_declaration name: (identifier) @local.definition.var)
+(resource name: (identifier) @local.definition.var)
 (field_declaration
   (variable_declarator name: (identifier) @local.definition.field))
 (for_in_statement variable: (identifier) @local.definition.var)

package/queries/groovy/tags.scm

@@ -65,3 +65,35 @@
 (super_interfaces (type_identifier) @name) @reference.implementation
 
 (extends_interfaces (type_identifier) @name) @reference.implementation
+
+; A generic super type is tagged by its base, and a qualified one by
+; its last segment: `implements Supplier<String>, a.b.Shaded`.
+(superclass
+  (generic_type base: (type_identifier) @name)) @reference.class
+
+(superclass
+  (qualified_type (type_identifier) @name .)) @reference.class
+
+(superclass
+  (generic_type
+    base: (qualified_type (type_identifier) @name .))) @reference.class
+
+(super_interfaces
+  (generic_type base: (type_identifier) @name)) @reference.implementation
+
+(super_interfaces
+  (qualified_type (type_identifier) @name .)) @reference.implementation
+
+(super_interfaces
+  (generic_type
+    base: (qualified_type (type_identifier) @name .))) @reference.implementation
+
+(extends_interfaces
+  (generic_type base: (type_identifier) @name)) @reference.implementation
+
+(extends_interfaces
+  (qualified_type (type_identifier) @name .)) @reference.implementation
+
+(extends_interfaces
+  (generic_type
+    base: (qualified_type (type_identifier) @name .))) @reference.implementation