feat: match 1.4.0

.github/workflows/ci.yml

@@ -34,3 +34,8 @@ jobs:
           test-python: false # default
           test-go: false     # default
           test-swift: false  # default
+
+      - name: Check correspondence to Ohm parser
+        run: |
+          git clone https://github.com/tact-lang/tact.git
+          npm run parse -- -q tact/src/grammar/test/*.tact

.gitignore

@@ -59,3 +59,6 @@ log.html
 .idea/
 .helix/
 .vim/
+
+# Emscripten SDK
+/emsdk

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-tact"
 description = "Tact grammar for the tree-sitter"
-version = "1.3.0"
+version = "1.4.0"
 authors = ["Novus Nota (https://github.com/novusnota)"]
 license = "MIT"
 keywords = ["incremental", "parsing", "tact"]

editor_queries/helix/highlights.scm

@@ -20,16 +20,11 @@
 ; variable.other.member
 ; ---------------------
 
-(field
+(storage_variable
   name: (identifier) @variable.other.member)
 
-(contract_body
-  (constant
-    name: (identifier) @variable.other.member))
-
-(trait_body
-  (constant
-    name: (identifier) @variable.other.member))
+(field
+  name: (identifier) @variable.other.member)
 
 (field_access_expression
   name: (identifier) @variable.other.member)
@@ -126,13 +121,16 @@
 ; string.special.path
 ; -------------------
 
-(import_statement
+(import
   library: (string) @string.special.path)
 
 ; constant
 ; --------
 
-(constant
+(global_constant
+  name: (identifier) @constant)
+
+(storage_constant
   name: (identifier) @constant)
 
 ; constant.character.escape
@@ -258,7 +256,7 @@
 (native_function
   name: (identifier) @function)
 
-(static_function
+(global_function
   name: (identifier) @function)
 
 (static_call_expression
@@ -276,7 +274,7 @@
 (external_function
   "external" @function.method)
 
-(function
+(storage_function
   name: (identifier) @function.method)
 
 ; function.method
@@ -300,10 +298,18 @@
     "checkSignature" "checkDataSignature" "sha256"
     "min" "max" "abs" "pow" "pow2" "log" "log2"
     "throw" "dump" "dumpStack" "getConfigParam"
-    "nativeThrowWhen" "nativeThrowUnless" "nativeReserve"
+    "nativeThrowIf" "nativeThrowUnless" "nativeReserve"
     "nativeRandomize" "nativeRandomizeLt" "nativePrepareRandom" "nativeRandom" "nativeRandomInterval")
   (#is-not? local))
 
+; attribute
+; ---------
+
+[
+  "@name"
+  "@interface"
+] @attribute
+
 ; comment.block
 ; -------------
 
@@ -314,11 +320,3 @@
 
 ((comment) @comment.line
   (#match? @comment.line "^//"))
-
-; attribute
-; ---------
-
-[
-  "@name"
-  "@interface"
-] @attribute

editor_queries/helix/textobjects.scm

@@ -3,7 +3,7 @@
 ; function.inside & around
 ; ------------------------
 
-(static_function
+(global_function
   body: (_) @function.inside) @function.around
 
 (init_function
@@ -18,7 +18,7 @@
 (external_function
   body: (_) @function.inside) @function.around
 
-(function
+(storage_function
   body: (_) @function.inside) @function.around
 
 ; class.inside & around

editor_queries/neovim/context.scm

@@ -19,7 +19,7 @@
 
 ; functions
 ; ---------
-(static_function
+(global_function
   body: (_
     (_) @context.end)) @context
 
@@ -39,7 +39,7 @@
   body: (_
     (_) @context.end)) @context
 
-(function
+(storage_function
   body: (_
     (_) @context.end)) @context
 

editor_queries/neovim/folds.scm

@@ -1,7 +1,7 @@
 ; See: https://github.com/nvim-treesitter/nvim-treesitter/blob/master/CONTRIBUTING.md#folds
 [
   ; import …
-  (import_statement)+
+  (import)+
   ; (…, …)
   (parameter_list)
   (argument_list)

editor_queries/neovim/highlights.scm

@@ -110,7 +110,7 @@
 
 ; string.special.path
 ; -------------------
-(import_statement
+(import
   library: (string) @string.special.path)
 
 ; boolean
@@ -119,7 +119,10 @@
 
 ; constant
 ; --------
-(constant
+(global_constant
+  name: (identifier) @constant)
+
+(storage_constant
   name: (identifier) @constant)
 
 ; constant.builtin
@@ -144,17 +147,12 @@
 (field_access_expression
   name: (identifier) @variable.member)
 
-(trait_body
-  (constant
-    name: (identifier) @variable.member))
-
-(contract_body
-  (constant
-    name: (identifier) @variable.member))
-
 (field
   name: (identifier) @variable.member)
 
+(storage_variable
+  name: (identifier) @variable.member)
+
 ; number
 ; ------
 (integer) @number
@@ -250,7 +248,7 @@
 (native_function
   name: (identifier) @function)
 
-(static_function
+(global_function
   name: (identifier) @function)
 
 (func_identifier) @function
@@ -269,7 +267,7 @@
 (external_function
   "external" @function.method)
 
-(function
+(storage_function
   name: (identifier) @function.method)
 
 ; function.call
@@ -291,19 +289,19 @@
     "contractAddress" "contractAddressExt" "emit" "cell" "ton" "dump" "dumpStack" "beginString"
     "beginComment" "beginTailString" "beginStringFromBuilder" "beginCell" "emptyCell" "randomInt"
     "random" "checkSignature" "checkDataSignature" "sha256" "min" "max" "abs" "pow" "pow2" "throw"
-    "nativeThrowWhen" "nativeThrowUnless" "getConfigParam" "nativeRandomize" "nativeRandomizeLt"
+    "nativeThrowIf" "nativeThrowUnless" "getConfigParam" "nativeRandomize" "nativeRandomizeLt"
     "nativePrepareRandom" "nativeRandom" "nativeRandomInterval" "nativeReserve"))
 
-; comment
-; -------
-(comment) @comment @spell
-
-((comment) @comment.documentation
-  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
-
 ; attribute
 ; ---------
 [
   "@name"
   "@interface"
 ] @attribute
+
+; comment
+; -------
+(comment) @comment @spell
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))

editor_queries/neovim/locals.scm

@@ -4,27 +4,33 @@
 ; Scopes       @local.scope
 ; -------------------------
 [
-  (static_function)
+  (global_function)
   (init_function)
   (bounced_function)
   (receive_function)
   (external_function)
-  (function)
+  (storage_function)
   (block_statement)
 ] @local.scope
 
 ; Definitions  @local.definition
 ; ------------------------------
 ; variables
+(storage_variable
+  name: (identifier) @local.definition.var)
+
 (let_statement
   name: (identifier) @local.definition.var)
 
 ; constants
-(constant
+(global_constant
+  name: (identifier) @local.definition.constant)
+
+(storage_constant
   name: (identifier) @local.definition.constant)
 
 ; functions
-(static_function
+(global_function
   name: (identifier) @local.definition.function
   (#set! definition.var.scope parent))
 
@@ -45,7 +51,7 @@
   "external" @local.definition.method
   (#set! definition.var.scope parent))
 
-(function
+(storage_function
   name: (identifier) @local.definition.method
   (#set! definition.var.scope parent))
 
@@ -56,12 +62,12 @@
 ; user-defined types (structs and messages)
 (type_identifier) @local.definition.type
 
-; fields (and properties)
+; fields (of messages and structs)
 (field
   name: (identifier) @local.definition.field)
 
 ; imports
-(import_statement
+(import
   (string) @local.definition.import)
 
 ; References   @local.reference

editor_queries/neovim/textobjects.scm

@@ -1,11 +1,11 @@
 ; See: https://github.com/nvim-treesitter/nvim-treesitter-textobjects#built-in-textobjects
 ; function.inner & outer
 ; ----------------------
-; static
-(static_function
+; global
+(global_function
   body: (_)) @function.outer
 
-(static_function
+(global_function
   body: (function_body
     .
     "{"
@@ -77,10 +77,10 @@
   (#make-range! "function.inner" @_start @_end))
 
 ; contract/trait function
-(function
+(storage_function
   body: (_)) @function.outer
 
-(function
+(storage_function
   body: (function_body
     .
     "{"
@@ -381,7 +381,15 @@
   name: (_) @assignment.lhs
   value: (_) @assignment.inner @assignment.rhs) @assignment.outer
 
-(constant
+(storage_variable
+  name: (_) @assignment.lhs
+  value: (_) @assignment.inner @assignment.rhs) @assignment.outer
+
+(global_constant
+  name: (_) @assignment.lhs
+  value: (_) @assignment.inner @assignment.rhs) @assignment.outer
+
+(storage_constant
   name: (_) @assignment.lhs
   value: (_) @assignment.inner @assignment.rhs) @assignment.outer