fixes #23, new tests for conflicts

EmranMR · Aug 13, 2023 · f20858b · f20858b
1 parent 319c255
commit f20858b
Show file tree

Hide file tree

Showing 6 changed files with 66,937 additions and 63,645 deletions.
diff --git a/corpus/conflicts.txt b/corpus/conflicts.txt
@@ -0,0 +1,40 @@
+==================
+Orphan Punctuation Marks
+==================
+
+@ { } {} () !
+
+---
+
+(blade
+  (php)
+  (php)
+  (php)
+  (php)
+  (php)
+  (php))
+
+==================
+text starting with @
+==================
+
+[email protected]
+
+@test
+
+@custom('test')
+    hello
+@endcustom
+
+---
+
+    (blade
+      (php)
+      (php)
+      (php)
+      (php)
+      (conditional
+        (directive_start)
+        (parameter)
+        (php)
+        (directive_end)))
diff --git a/grammar.js b/grammar.js
@@ -412,11 +412,12 @@ module.exports = grammar({
         // !text
         text: ($) =>
             choice(
-                token(prec(-2, /[{}!@()?-]/)),
+                token(prec(-1, /[{}!@()?-][a-zA-Z\d]*[^\(]/)), // custom directive conflict resolution
+                token(prec(-2, /[{}!@()?-]/)), // orphan tags
                 token(
                     prec(
                         -1,
-                        /[^\s(){!}@-]([^(){!}@?]*[^\s{!}()@?-])?/
+                        /[^\s(){!}@-]([^(){!}@?]*[^\s{!}()@?-])?/ //general text
                     )
                 )
             ),

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tree-sitter-blade",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "tree-sitter-blade for Laravel Blade files",
     "main": "bindings/node",
     "keywords": [
@@ -27,7 +27,7 @@
         "nan": "^2.17.0"
     },
     "devDependencies": {
-        "tree-sitter-cli": "^0.20.7"
+        "tree-sitter-cli": "^0.20.8"
     },
     "tree-sitter": [
         {

diff --git a/src/grammar.json b/src/grammar.json
@@ -1659,6 +1659,17 @@
     "text": {
       "type": "CHOICE",
       "members": [
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "PREC",
+            "value": -1,
+            "content": {
+              "type": "PATTERN",
+              "value": "[{}!@()?-][a-zA-Z\\d]*[^\\(]"
+            }
+          }
+        },
         {
           "type": "TOKEN",
           "content": {