fixes #24 added new tests

EmranMR · Aug 18, 2023 · e34a115 · e34a115
1 parent f20858b
commit e34a115
Show file tree

Hide file tree

Showing 5 changed files with 41,031 additions and 40,352 deletions.
diff --git a/corpus/conflicts.txt b/corpus/conflicts.txt
@@ -2,11 +2,15 @@
 Orphan Punctuation Marks
 ==================
 
-@ { } {} () !
+@ { } {} () ! ( )
 
 ---
 
 (blade
+  (php)
+  (php)
+  (php)
+  (php)
   (php)
   (php)
   (php)
@@ -28,13 +32,41 @@ test@test.com
 
 ---
 
-    (blade
-      (php)
-      (php)
-      (php)
-      (php)
-      (conditional
-        (directive_start)
-        (parameter)
-        (php)
-        (directive_end)))
+(blade
+  (php)
+  (php)
+  (php)
+  (php)
+  (conditional
+    (directive_start)
+    (parameter)
+    (php)
+    (directive_end)))
+
+==================
+Comments Ending with Punctuation Conflict
+==================
+
+{{--)--}}
+{{--}--}}
+{{--@--}}
+{{--!--}}
+
+---
+(blade
+  (comment
+    (bracket_start)
+    (text)
+    (bracket_end))
+  (comment
+    (bracket_start)
+    (text)
+    (bracket_end))
+  (comment
+    (bracket_start)
+    (text)
+    (bracket_end))
+  (comment
+    (bracket_start)
+    (text)
+    (bracket_end)))
diff --git a/grammar.js b/grammar.js
@@ -412,7 +412,7 @@ module.exports = grammar({
         // !text
         text: ($) =>
             choice(
-                token(prec(-1, /[{}!@()?-][a-zA-Z\d]*[^\(]/)), // custom directive conflict resolution
+                token(prec(-1, /@[a-zA-Z\d]*[^\(-]/)), // custom directive conflict resolution
                 token(prec(-2, /[{}!@()?-]/)), // orphan tags
                 token(
                     prec(

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tree-sitter-blade",
-    "version": "0.3.1",
+    "version": "0.3.2",
     "description": "tree-sitter-blade for Laravel Blade files",
     "main": "bindings/node",
     "keywords": [

diff --git a/src/grammar.json b/src/grammar.json
@@ -1666,7 +1666,7 @@
             "value": -1,
             "content": {
               "type": "PATTERN",
-              "value": "[{}!@()?-][a-zA-Z\\d]*[^\\(]"
+              "value": "@[a-zA-Z\\d]*[^\\(-]"
             }
           }
         },