fix: allow string concatenations to start with an identifier

We do ensure at least one string is present though, otherwise conflicts arise
tree-sitter · Aug 9, 2023 · d0c0b89 · d0c0b89
1 parent bfda5b9
commit d0c0b89
Show file tree

Hide file tree

Showing 3 changed files with 62,709 additions and 62,398 deletions.
diff --git a/grammar.js b/grammar.js
@@ -1116,8 +1116,9 @@ module.exports = grammar({
     ),
 
     concatenated_string: $ => seq(
+      choice($.identifier, $.string_literal),
       $.string_literal,
-      repeat1(choice($.string_literal, $.identifier)), // Identifier is added to parse macros that are strings, like PRIu64
+      repeat(choice($.string_literal, $.identifier)), // Identifier is added to parse macros that are strings, like PRIu64
     ),
 
     string_literal: $ => seq(

diff --git a/src/grammar.json b/src/grammar.json
@@ -7431,12 +7431,25 @@
     "concatenated_string": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "identifier"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "string_literal"
+            }
+          ]
+        },
         {
           "type": "SYMBOL",
           "name": "string_literal"
         },
         {
-          "type": "REPEAT1",
+          "type": "REPEAT",
           "content": {
             "type": "CHOICE",
             "members": [