[move][treesitter] Refactor and update Move treesitter implementation

Author: tzakian

external-crates/move/tooling/tree-sitter/grammar.js

@@ -7,7 +7,7 @@
     "tree-sitter": "^0.21.0"
   },
   "peerDependenciesMeta": {
-    "tree_sitter": {
+    "tree-sitter": {
       "optional": true
     }
   },

external-crates/move/tooling/tree-sitter/package.json

@@ -26,7 +26,6 @@
 (function_definition name: (function_identifier)  @function)
 (macro_function_definition name: (function_identifier)  @macro)
 (native_function_definition name: (function_identifier)  @function)
-(usual_spec_function name: (function_identifier)  @function)
 (function_parameter name: (variable_identifier)  @variable.parameter)
 
 ;; Module definitions
@@ -40,7 +39,6 @@
 (call_expression (name_expression access: (module_access module: (module_identifier)  @namespace.module.name)))
 (call_expression (name_expression access: (module_access member: (identifier)  @function.call)))
 
-
 (label (identifier)  @label)
 
 ;; Macro calls
@@ -53,8 +51,6 @@
 (byte_string_literal) @string.byte
 (address_literal) @number.address
 
-;; Binders
-
 ;; Uses
 (use_member member: (identifier)  @include.member)
 (use_module alias: (module_identifier) @namespace.module.name)
@@ -64,9 +60,6 @@
 
 (function_identifier) @function.name
 
-;; Friends
-; (friend_access local_module: (identifier)  @namespace.module.name)
-
 ;; Structs
 (struct_definition name: (struct_identifier)  @type.definition.struct)
 (ability) @type.ability
@@ -81,7 +74,6 @@
 (pack_expression (name_expression access: (module_access)  @constructor.name))
 
 ;; Unpacks
-;; TODO: go into variants
 (bind_unpack (name_expression)  @type.name)
 (module_access "$" (identifier)  @macro.variable)
 "$"  @macro.variable
@@ -91,35 +83,14 @@
 (abort_expression) @keyword
 (mut_ref) @keyword
 
-;; Lambdas
-; (lambda_binding bind: (bind_var (variable_identifier)  @variable.parameter))
-; (lambda_bindings (bind_var (variable_identifier)  @variable.parameter))
-
-
 ;; Operators
 (binary_operator) @operator
 (unary_op) @operator
 "=>" @operator
 "@" @operator
 "->" @operator
 
-;; Specs
-(spec_block target: (identifier)  @function.spec.target)
-(spec_pragma) @preproc.annotation.spec
-(spec_condition kind: (condition_kind) @condition.spec)
-(condition_properties) @preproc.spec.condition.properties
-
-; (match_expression "match") @keyword
-
-;; Spec keywords
-; "opaque" @keyword
-; "aborts_if" @keyword
-; "abstract" @keyword
-[
- "pragma"
-] @keyword
-
-;; Source Language Keywords
+;; Keywords
 [
  "fun"
  "return"
@@ -146,6 +117,5 @@
  "break"
  "continue"
  "loop"
+ "match"
 ] @keyword
-
- "match" @keyword

external-crates/move/tooling/tree-sitter/queries/highlights.scm

@@ -1,53 +1,13 @@
-; Function Scope
-; (function_definition
-;   body: (block) @scope
-;   parameters: (function_parameters (function_parameter name: (variable_identifier) @definition.var)))
+; Minimal scope tracking for Move.
 
+; Function Scope
 (function_definition body: (block) @scope)
 
 (function_parameter name: (variable_identifier) @definition.var)
 (function_parameter name: (variable_identifier) @local.definition)
 
 (identifier) @local.reference
 
-
-; Module and Struct Scope
+; Module Scope
 (module_definition
   (module_body) @scope)
-
-; (struct_definition
-;   (struct_def_fields) @scope)
-
-; Spec Block Scope
-(spec_block
-  body: (spec_body) @scope)
-
-; Local Variable Declarations in Function Blocks
-; (let_statement
-;   binds: (bind_list
-;            (bind_var (variable_identifier) @definition.var)
-;            (bind_unpack 
-;              (bind_field (field_identifier) @definition.var))))
-
-; Local Variable Declarations in Spec Blocks
-; (spec_block
-;   (spec_variable name: (identifier) @definition.var))
-
-; Parameters in Spec Functions
-; (spec_function
-;   parameters: (function_parameters (function_parameter name: (identifier) @definition.var)))
-;
-; ; Type Parameters
-; (type_parameters
-;   (type_parameter name: (identifier) @definition.type)))
-;
-; ; Struct Fields
-; (struct_definition
-;   (struct_def_fields
-;     (field_annotation
-;       field: (identifier) @definition.field)))
-;
-; ; Function and Module Identifiers
-; (function_definition name: (identifier) @definition.function)
-; (module_definition name: (identifier) @definition.module)
-;

external-crates/move/tooling/tree-sitter/queries/locals.scm

@@ -1,8 +1,28 @@
 #!/bin/bash
+set -euo pipefail
 
-SUI_FRAMEWORK_DIR="../../../../crates/sui-framework/packages/sui-framework/**/*.move"
-STDLIB_DIR="../../../../sui-framework/packages/move-stdlib/**/*.move"
+SUI_FRAMEWORK_DIR="../../../../crates/sui-framework/packages/**/*.move"
 
-tree-sitter generate --no-bindings
+tree-sitter generate
+
+echo "=== Parsing test files ==="
 tree-sitter parse -q -t tests/*.move
-tree-sitter parse -q -t tree-sitter $SUI_FRAMEWORK_DIR
+
+echo "=== Parsing Sui framework files ==="
+tree-sitter parse -q -t $SUI_FRAMEWORK_DIR
+
+echo "=== Checking node-types.json baseline ==="
+if [ -f tests/baseline-node-types.json ]; then
+  if ! diff -q src/node-types.json tests/baseline-node-types.json > /dev/null 2>&1; then
+    echo "WARNING: node-types.json differs from baseline!"
+    diff src/node-types.json tests/baseline-node-types.json || true
+    echo "If this is intentional, update the baseline: cp src/node-types.json tests/baseline-node-types.json"
+  else
+    echo "node-types.json matches baseline."
+  fi
+else
+  echo "No baseline found. Creating initial baseline."
+  cp src/node-types.json tests/baseline-node-types.json
+fi
+
+echo "=== All tests passed ==="