@felixtensor/tree-sitter-mlir 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@felixtensor/tree-sitter-mlir",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "MLIR grammar for tree-sitter",
   "type": "module",
   "repository": {
@@ -36,8 +36,8 @@
     "node-gyp-build": "^4.8.4"
   },
   "devDependencies": {
+    "node-gyp": "^12.4.0",
     "prebuildify": "^6.0.1",
-    "tree-sitter": "^0.25.0",
     "tree-sitter-cli": "^0.26.9"
   },
   "peerDependencies": {

package/queries/highlights.scm

@@ -11,11 +11,17 @@
 (func_operation name: _ @function.builtin)
 (module_operation name: _ @function.builtin)
 (func_operation ["private" "public" "attributes"] @keyword)
+(function_specifier) @keyword
 (module_operation "attributes" @keyword)
 
 ;; Dialect operations (e.g., arith.addi)
 (custom_op_name) @function.builtin
-(generic_operation (string_literal) @function.builtin)
+(custom_operation ["array" "sparse" "tensor" "vector"] @keyword)
+(custom_operation ["+" "-" "*" "/" "&" "|" "~"] @operator)
+(custom_operation "?" @punctuation.special)
+(custom_operation "loc" @keyword)
+(custom_operation "module(" @keyword)
+(custom_operation ">" @punctuation.bracket)
 
 ;; Symbols (@name)
 (symbol_ref_id) @string.special.symbol
@@ -42,20 +48,48 @@
 (dim_list "x" @punctuation.delimiter)
 (dimension_separator) @punctuation.delimiter
 (vector_dim_list "x" @punctuation.delimiter)
+(dim_list ["?" "*"] @punctuation.special)
+(dialect_dim_list ["?" "*"] @punctuation.special)
 
 [(attribute_alias) (attribute_alias_def) (dialect_attribute) (builtin_attribute) (dictionary_attribute)] @attribute
 
 ;; Specific attribute content
+(properties ["<{" "}>"] @punctuation.bracket)
+(affine_map "affine_map" @keyword)
+(affine_set "affine_set" @keyword)
 (affine_map ["max" "min" "symbol"] @keyword)
 (affine_set ["max" "min" "symbol"] @keyword)
+(affine_map
+  ["dense" "sparse" "compressed" "singleton" "loose_compressed" "n_out_of_m"]
+  @keyword)
+(affine_set
+  ["dense" "sparse" "compressed" "singleton" "loose_compressed" "n_out_of_m"]
+  @keyword)
+(affine_map ["+" "-" "*" "==" ">=" "<="] @operator)
+(affine_set ["+" "-" "*" "==" ">=" "<="] @operator)
+(strided_layout "strided" @keyword)
 (strided_layout "offset" @keyword)
-["ceildiv" "floordiv" "mod"] @keyword.operator
+(strided_layout ["?" "*"] @punctuation.special)
+(distinct_attribute "distinct" @keyword)
+(dense_resource_literal "dense_resource" @keyword)
+["ceildiv" "floordiv" "mod"] @operator
+(pretty_dialect_item_body
+  ["array" "dense" "opaque" "sparse" "tensor" "vector"] @keyword)
+(pretty_dialect_item_body ["?" "*"] @punctuation.special)
 
 ;; ── Literals ────────────────────────────────────────────────────────────────
 [(integer_literal) (float_literal) (complex_literal)] @number
 (bool_literal) @boolean
-[(tensor_literal) (dense_resource_literal) (array_literal) (unit_literal) (uninitialized_literal)] @constant.builtin
+[(tensor_literal) (array_literal) (unit_literal) (uninitialized_literal)] @constant.builtin
+(tensor_literal ["dense" "sparse"] @keyword)
+(array_literal "array" @keyword)
 (string_literal) @string
+(generic_operation (string_literal) @function.builtin)
+
+;; Escape sequences inside strings (\n, \t, \", \\, \HH) overlay on @string;
+;; malformed escapes are flagged distinctly rather than silently colored.
+(escape_sequence) @string.escape
+(invalid_escape) @error
 
 ;; ── SSA Variables (%name) ───────────────────────────────────────────────────
 ;; General uses and results (catch-all, overridden by more specific rules below)
@@ -67,17 +101,31 @@
 (block_arg_list (value_use) @variable.parameter)
 
 ;; ── Control Flow ────────────────────────────────────────────────────────────
-(caret_id) @label
+(caret_id) @tag
 (trailing_location "loc" @keyword)
+(callsite_location ["callsite" "at"] @keyword)
+(fused_location "fused" @keyword)
+(location "to" @keyword)
+(unknown_location) @constant.builtin
 (variadic) @punctuation.special
 
+;; ── External Resource Blocks ───────────────────────────────────────────────
+(external_resources ["{-#" "#-}"] @punctuation.bracket)
+
 ;; ── Punctuation ─────────────────────────────────────────────────────────────
 ["(" ")" "{" "}" "[" "]" "<" ">"] @punctuation.bracket
 ["," ":"] @punctuation.delimiter
 ["=" "->" "::"] @operator
 
-;; Catch-all for bare keywords in Op bodies (ins, outs, etc.)
-(bare_id) @keyword
+;; Catch-all for bare keywords in custom operation bodies (ins, outs, etc.).
+;; Keep this scoped to direct custom_operation children so attribute keys,
+;; affine dimensions, and pretty dialect payload identifiers do not all become
+;; keywords.
+(custom_operation (bare_id) @keyword)
+
+;; Dense resource handles override the bare_id catch-all above.
+(dense_resource_literal (bare_id) @constant.builtin)
 
 ;; Dictionary attribute keys override the bare_id catch-all above
 (attribute_entry (bare_id) @attribute)
+(attribute_entry (string_literal) @attribute)

package/src/parser.c

@@ -76085,7 +76085,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_mlir(void) {
     .metadata = {
       .major_version = 0,
       .minor_version = 1,
-      .patch_version = 5,
+      .patch_version = 6,
     },
   };
   return &language;

package/tree-sitter.json

@@ -8,11 +8,14 @@
       "scope": "source.mlir",
       "file-types": ["mlir"],
       "injection-regex": "^mlir$",
-      "class-name": "TreeSitterMlir"
+      "class-name": "TreeSitterMlir",
+      "highlights": "queries/highlights.scm",
+      "locals": "queries/locals.scm",
+      "injections": "queries/injections.scm"
     }
   ],
   "metadata": {
-    "version": "0.1.5",
+    "version": "0.1.6",
     "license": "Apache-2.0 WITH LLVM-exception",
     "description": "MLIR grammar for tree-sitter",
     "authors": [