@willbooster/tree-sitter-go 5.0.0 → 6.1.0

package/README.md

@@ -5,7 +5,7 @@
 [![Test](https://github.com/WillBooster/tree-sitter-go/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-go/actions/workflows/test.yml)
 [![Test rust](https://github.com/WillBooster/tree-sitter-go/actions/workflows/test-rust.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-go/actions/workflows/test-rust.yml)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
-[![wbfy](https://img.shields.io/badge/wbfy-20.43.2-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.48.9-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
 [![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-go.svg)](https://crates.io/crates/willbooster-tree-sitter-go)
 
 Go grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), forked from
@@ -14,16 +14,17 @@ to its authors and contributors. This is not an official release of that project
 
 This fork extends upstream's version 0.25.0 grammar with method type parameters and generates the parser with the
 [WillBooster/tree-sitter](https://github.com/WillBooster/tree-sitter) generator. The parser carries that fork's own ABI
-number (`0x57420009`), so it loads only with the WillBooster runtime, version 13.0.0 or later within 13.x
+number (`0x5742000b`), so it loads only with the WillBooster runtime, version 15.0.0 or later within 15.x
 (`willbooster-tree-sitter`, `@willbooster/web-tree-sitter`), and not with upstream's tree-sitter.
 
 ## Usage
 
 The npm package ships `tree-sitter-go.wasm` for
-[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 13.0.0 or later within 13.x, which runs in Node.js, Bun, browsers, and Cloudflare Workers. In Node.js and Bun, load the grammar from its path:
+[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 15.0.0 or later within 15.x, which runs in Node.js, Bun, browsers, and Cloudflare Workers. In Node.js and Bun, load the grammar from its path:
 
 ```js
 import { fileURLToPath } from 'node:url';
+
 import { Language, Parser } from '@willbooster/web-tree-sitter';
 
 await Parser.init();
@@ -36,9 +37,9 @@ const tree = parser.parse('package main\n\nfunc main() {}\n');
 In browsers, serve both `.wasm` files and load them by URL (the example uses Vite's `?url` imports):
 
 ```js
+import goUrl from '@willbooster/tree-sitter-go/tree-sitter-go.wasm?url';
 import { Language, Parser } from '@willbooster/web-tree-sitter';
 import runtimeUrl from '@willbooster/web-tree-sitter/web-tree-sitter.wasm?url';
-import goUrl from '@willbooster/tree-sitter-go/tree-sitter-go.wasm?url';
 
 await Parser.init({ locateFile: () => runtimeUrl });
 const parser = new Parser();
@@ -49,9 +50,9 @@ Cloudflare Workers do not allow compiling Wasm at run time, so import both `.was
 Node.js compatibility:
 
 ```js
+import go from '@willbooster/tree-sitter-go/tree-sitter-go.wasm';
 import { Language, Parser } from '@willbooster/web-tree-sitter';
 import runtime from '@willbooster/web-tree-sitter/web-tree-sitter.wasm';
-import go from '@willbooster/tree-sitter-go/tree-sitter-go.wasm';
 
 await Parser.init({ wasmModule: runtime });
 const parser = new Parser();
@@ -66,8 +67,8 @@ fuzzed with:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "13.0.0" }
-tree-sitter-go = { package = "willbooster-tree-sitter-go", version = "5" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "15.0.0" }
+tree-sitter-go = { package = "willbooster-tree-sitter-go", version = "6" }
 ```
 
 ```rust

package/grammar.js

@@ -63,6 +63,7 @@ const hexFloatLiteral = seq('0', choice('x', 'X'), hexMantissa, hexExponent);
 const floatLiteral = choice(decimalFloatLiteral, hexFloatLiteral);
 
 const imaginaryLiteral = seq(choice(decimalDigits, intLiteral, floatLiteral), 'i');
+const formatArgumentIndex = /\[0*[1-9][0-9]*\]/;
 
 module.exports = grammar({
   name: 'go',
@@ -886,19 +887,34 @@ module.exports = grammar({
 
     raw_string_literal: $ => seq(
       '`',
-      alias(token(prec(1, /[^`]*/)), $.raw_string_literal_content),
-      '`',
+      repeat(choice(
+        alias(token.immediate(prec(1, /[^`%]+/)), $.raw_string_literal_content),
+        alias(token.immediate('%'), $.raw_string_literal_content),
+        $.format_specifier,
+      )),
+      token.immediate('`'),
     ),
 
     interpreted_string_literal: $ => seq(
       '"',
       repeat(choice(
-        alias(token.immediate(prec(1, /[^"\n\\]+/)), $.interpreted_string_literal_content),
+        alias(token.immediate(prec(1, /[^"\n\\%]+/)), $.interpreted_string_literal_content),
+        alias(token.immediate('%'), $.interpreted_string_literal_content),
+        $.format_specifier,
         $.escape_sequence,
       )),
       token.immediate('"'),
     ),
 
+    format_specifier: _ => token.immediate(prec(2, seq(
+      '%',
+      /[+#0 -]*/,
+      optional(choice(/[0-9]+/, seq(optional(formatArgumentIndex), '*'))),
+      optional(seq('.', choice(/[0-9]*/, seq(optional(formatArgumentIndex), '*')))),
+      optional(formatArgumentIndex),
+      /[vTtbcdoOqxXUeEfFgGspw%]/,
+    ))),
+
     escape_sequence: _ => token.immediate(seq(
       '\\',
       choice(

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@willbooster/tree-sitter-go",
-  "version": "5.0.0",
+  "version": "6.1.0",
   "description": "Go grammar for tree-sitter",
   "keywords": [
+    "go",
     "incremental",
     "parsing",
-    "tree-sitter",
-    "go"
+    "tree-sitter"
   ],
+  "license": "MIT",
+  "author": "WillBooster Inc.",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/WillBooster/tree-sitter-go.git"
   },
-  "license": "MIT",
-  "author": "WillBooster Inc.",
   "files": [
     "grammar.js",
     "queries/*.scm",
@@ -21,6 +21,10 @@
     "tree-sitter.json",
     "*.wasm"
   ],
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
   "scripts": {
     "build-wasm": "script/generate --build-wasm",
     "build/ci": "bun run build-wasm",
@@ -43,32 +47,25 @@
   "devDependencies": {
     "@tsconfig/bun": "1.0.11",
     "@types/bun": "1.4.3",
-    "@vitest/browser-playwright": "5.0.3",
-    "@willbooster/oxfmt-config": "1.2.2",
-    "@willbooster/oxlint-config": "1.4.8",
-    "@willbooster/wb": "22.26.2",
-    "@willbooster/web-tree-sitter": "13.0.0",
+    "@vitest/browser-playwright": "5.0.5",
+    "@willbooster/oxlint-config": "1.4.9",
+    "@willbooster/wb": "22.29.3",
+    "@willbooster/web-tree-sitter": "15.0.0",
     "conventional-changelog-conventionalcommits": "10.4.1",
     "lefthook": "2.2.2",
-    "oxfmt": "0.73.0",
     "oxlint": "1.88.0",
     "oxlint-tsgolint": "7.0.2004",
-    "playwright": "1.64.0",
+    "playwright": "1.64.1",
     "semantic-release": "25.0.9",
-    "sort-package-json": "4.0.0",
-    "vitest": "5.0.3",
-    "wrangler": "4.149.0"
+    "vitest": "5.0.5",
+    "wrangler": "4.151.1"
   },
   "peerDependencies": {
-    "@willbooster/web-tree-sitter": "^13.0.0"
+    "@willbooster/web-tree-sitter": "^15.0.0"
   },
   "peerDependenciesMeta": {
     "@willbooster/web-tree-sitter": {
       "optional": true
     }
-  },
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
   }
 }

package/queries/highlights.scm

@@ -93,6 +93,62 @@
   (rune_literal)
 ] @string
 
+((call_expression
+  function: (identifier) @function
+  arguments: (argument_list
+    . (comment)*
+    . [
+      (interpreted_string_literal
+        . [(interpreted_string_literal_content) (escape_sequence) (format_specifier) @string.special]* .)
+      (raw_string_literal
+        . [(raw_string_literal_content) (format_specifier) @string.special]* .)
+    ]))
+  (#match? @function "^(Printf|Sprintf|Errorf|Scanf|Fatalf|Panicf|Skipf|Logf|Debugf|Infof|Warnf|Warningf|Tracef)$"))
+
+((call_expression
+  function: (selector_expression field: (field_identifier) @function.method)
+  arguments: (argument_list
+    . (comment)*
+    . [
+      (interpreted_string_literal
+        . [(interpreted_string_literal_content) (escape_sequence) (format_specifier) @string.special]* .)
+      (raw_string_literal
+        . [(raw_string_literal_content) (format_specifier) @string.special]* .)
+    ]))
+  (#match? @function.method "^(Printf|Sprintf|Errorf|Scanf|Fatalf|Panicf|Skipf|Logf|Debugf|Infof|Warnf|Warningf|Tracef)$"))
+
+((call_expression
+  function: (identifier) @function
+  arguments: (argument_list
+    . (comment)*
+    . (_)
+    . (comment)*
+    . ","
+    . (comment)*
+    . [
+      (interpreted_string_literal
+        . [(interpreted_string_literal_content) (escape_sequence) (format_specifier) @string.special]* .)
+      (raw_string_literal
+        . [(raw_string_literal_content) (format_specifier) @string.special]* .)
+    ]))
+  (#match? @function "^(Fprintf|Appendf|Fscanf|Sscanf)$"))
+
+((call_expression
+  function: (selector_expression field: (field_identifier) @function.method)
+  arguments: (argument_list
+    . (comment)*
+    . (_)
+    . (comment)*
+    . ","
+    . (comment)*
+    . [
+      (interpreted_string_literal
+        . [(interpreted_string_literal_content) (escape_sequence) (format_specifier) @string.special]* .)
+      (raw_string_literal
+        . [(raw_string_literal_content) (format_specifier) @string.special]* .)
+    ]))
+  (#match? @function.method "^(Fprintf|Appendf|Fscanf|Sscanf)$"))
+
 (escape_sequence) @escape
 
 [

package/src/node-types.json

@@ -1445,6 +1445,10 @@
           "type": "escape_sequence",
           "named": true
         },
+        {
+          "type": "format_specifier",
+          "named": true
+        },
         {
           "type": "interpreted_string_literal_content",
           "named": true
@@ -1879,9 +1883,13 @@
     "named": true,
     "fields": {},
     "children": {
-      "multiple": false,
-      "required": true,
+      "multiple": true,
+      "required": false,
       "types": [
+        {
+          "type": "format_specifier",
+          "named": true
+        },
         {
           "type": "raw_string_literal_content",
           "named": true
@@ -2940,6 +2948,10 @@
     "type": "for",
     "named": false
   },
+  {
+    "type": "format_specifier",
+    "named": true
+  },
   {
     "type": "func",
     "named": false

package/tree-sitter.json

@@ -14,7 +14,7 @@
     }
   ],
   "metadata": {
-    "version": "5.0.0",
+    "version": "6.1.0",
     "license": "MIT",
     "description": "Go grammar for tree-sitter",
     "authors": [