chore: adjust Neovim queries (#42)

* chore: adjust Neovim queries

* fix: proper return index integers in asm arrangements

* chore: version bump to 1.5.2

* feat(ci): run the built-in fuzzer added in tree-sitter-cli 0.23.0

* fix: simplify the query

* chore(CI): pin the tree-sitter version

This prevents sudden breaks of CI due to changes in the config format or
other breaking changes from upstream

* chore(CI): pin Node.js version too

* fix: wrong dependency version

Author: novusnota

.github/workflows/ci.yml

@@ -25,17 +25,24 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: tree-sitter/setup-action/cli@v1
+        with:
+          tree-sitter-ref: "v0.23.2"
       - uses: tree-sitter/parser-test-action@v2
         with:
           generate: true
           test-parser: true
           # test-parser-cmd: tree-sitter test # default
           test-rust: ${{runner.os != 'Windows'}}
           test-node: ${{runner.os != 'Windows'}}
+          node-version: "22.8.0"
           test-python: false # default
           test-go: false     # default
           test-swift: false  # default
 
+      - name: Run built-in Tree-sitter fuzzer
+        run:
+          npm run ts -- fuzz --edits 500000 --iterations 10000
+
       - name: Check correspondence to Ohm parser
         if: ${{ runner.os != 'Windows' }}
         run: |

Cargo.toml

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

Makefile

@@ -96,9 +96,7 @@
 
 (tlb_serialization
   "as" @keyword
-  type: (identifier) @type.builtin
-  (#match? @type.builtin
-    "^(coins|remaining|bytes32|bytes64|int257|u?int(?:2[0-5][0-6]|1[0-9][0-9]|[1-9][0-9]?))$"))
+  type: (identifier) @type.builtin)
 
 ; string
 ; ------

editor_queries/neovim/highlights.scm

@@ -873,7 +873,13 @@ module.exports = grammar({
     },
 
     // Used in arrangements of arguments to return values in asm functions
-    _decimal_integer: (_) => /\d+/,
+    _decimal_integer: (_) => {
+      const dec_digits = /(?:_?\d)*/;
+      const dec_literal = seq(/[1-9]/, optional(dec_digits));
+      const dec_leading_zero_literal = seq(/\d/, optional(dec_digits));
+
+      return token(choice(dec_literal, dec_leading_zero_literal));
+    },
 
     /* Comments */
 

grammar.js

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-tact",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "A tree-sitter grammar for the Tact programming language",
   "author": "Novus Nota (https://github.com/novusnota)",
   "license": "MIT",

package-lock.json

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "tree-sitter-tact"
 description = "Tact grammar for tree-sitter"
-version = "1.5.1"
+version = "1.5.2"
 keywords = ["incremental", "parsing", "tree-sitter", "tact"]
 classifiers = [
   "Intended Audience :: Developers",