@willbooster/tree-sitter-go 6.0.0 → 6.1.0

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,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-go",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "Go grammar for tree-sitter",
   "keywords": [
     "go",

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": "6.0.0",
+    "version": "6.1.0",
     "license": "MIT",
     "description": "Go grammar for tree-sitter",
     "authors": [