Merge pull request stadelmanma#141 from stadelmanma/fix-string-literal-continuation

Fix string literals immediately followed by line continuation

Author: stadelmanma

Cargo.toml

@@ -21,4 +21,4 @@ tree-sitter-language = "0.1.0"
 cc = "1.0"
 
 [dev-dependencies]
-tree-sitter = "0.24"
+tree-sitter = "0.25"

package.json

@@ -50,10 +50,10 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "prebuildify": "^6.0.0",
-    "tree-sitter-cli": "^0.24.7"
+    "tree-sitter-cli": "^0.25.4"
   },
   "peerDependencies": {
-    "tree-sitter": "^0.22.4"
+    "tree-sitter": "^0.25.4"
   },
   "peerDependenciesMeta": {
     "tree_sitter": {

src/grammar.json

@@ -7949,21 +7949,26 @@
         "type": "SEQ",
         "members": [
           {
-            "type": "ALIAS",
-            "content": {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SEQ",
-                  "members": [
-                    {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "ALIAS",
+                    "content": {
                       "type": "PATTERN",
                       "value": "[eE][nN][dD]"
                     },
-                    {
-                      "type": "CHOICE",
-                      "members": [
-                        {
+                    "named": false,
+                    "value": "end"
+                  },
+                  {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "ALIAS",
+                        "content": {
                           "type": "CHOICE",
                           "members": [
                             {
@@ -7985,21 +7990,26 @@
                             }
                           ]
                         },
-                        {
-                          "type": "BLANK"
-                        }
-                      ]
-                    }
-                  ]
-                },
-                {
+                        "named": false,
+                        "value": "blockdata"
+                      },
+                      {
+                        "type": "BLANK"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "ALIAS",
+                "content": {
                   "type": "PATTERN",
                   "value": "[eE][nN][dD][[oO][bB][jJ][eE][cC][tT] O[bB][jJ][eE][cC][tT]]"
-                }
-              ]
-            },
-            "named": false,
-            "value": "end[object Object]"
+                },
+                "named": false,
+                "value": "endblockdata"
+              }
+            ]
           },
           {
             "type": "CHOICE",
@@ -21248,5 +21258,6 @@
     "_top_level_item",
     "_statement"
   ],
-  "supertypes": []
-}
+  "supertypes": [],
+  "reserved": {}
+}

src/node-types.json

@@ -13676,7 +13676,8 @@
   },
   {
     "type": "&",
-    "named": false
+    "named": false,
+    "extra": true
   },
   {
     "type": "&&",
@@ -13972,7 +13973,8 @@
   },
   {
     "type": "comment",
-    "named": true
+    "named": true,
+    "extra": true
   },
   {
     "type": "common",
@@ -14071,15 +14073,15 @@
     "named": false
   },
   {
-    "type": "end[object Object]",
+    "type": "endassociate",
     "named": false
   },
   {
-    "type": "endassociate",
+    "type": "endblock",
     "named": false
   },
   {
-    "type": "endblock",
+    "type": "endblockdata",
     "named": false
   },
   {