POC #28, #34, #33

EmranMR · Jan 8, 2024 · 76078c7 · 76078c7
1 parent 01e5550
commit 76078c7
Show file tree

Hide file tree

Showing 5 changed files with 135,515 additions and 127,758 deletions.
diff --git a/grammar.js b/grammar.js
@@ -13,11 +13,13 @@ module.exports = grammar({
                 $._nested_directive,
                 $.loop_operator,
                 $.comment,
-                $.text
+                $.text,
+                $.alpine_js
             ),
 
         // https://stackoverflow.com/questions/13014947/regex-to-match-a-c-style-multiline-comment/36328890#36328890
-        comment: $ => token(seq('{{--', /[^-]*-+([^}-][^-]*-+)*/, '}}')),
+        comment: ($) =>
+            token(seq('{{--', /[^-]*-+([^}-][^-]*-+)*/, '}}')),
 
         // !keywords
         keyword: ($) =>
@@ -488,6 +490,14 @@ module.exports = grammar({
                 alias('@endvolt', $.directive_end)
             ),
 
+        alpine_js: ($) =>
+            seq(
+                token(prec(1, /x-[a-zA-Z1-9]+=/)),
+                token(prec(1, /[\"\']/)),
+                $.text,
+                token(prec(1, /[\"\']/))
+            ),
+
         /*------------------------------------
         /  Do NOT change below this line   /
         /  without running tests           /
@@ -544,11 +554,11 @@ module.exports = grammar({
         _text: ($) =>
             choice(
                 token(prec(-1, /@[a-zA-Z\d]*[^\(-]/)), // custom directive conflict resolution
-                token(prec(-2, /[{}!@()?,-]/)), // orphan tags
+                token(prec(-2, /[\"\'x{}!@()?,-]/)), // orphan tags
                 token(
                     prec(
                         -1,
-                        /[^\s(){!}@-]([^(){!}@,?]*[^{!}()@?,-])?/ //general text
+                        /[^\"\'\sx(){!}@-]([^\"\'x(){!}@,?]*[^\"\'x{!}()@?,-])?/ //general text
                     )
                 )
             ),

diff --git a/queries/injections.scm b/queries/injections.scm
@@ -1,15 +1,17 @@
 ((text) @injection.content
-    (#not-has-ancestor? @injection.content "envoy")
+    (#not-has-ancestor? @injection.content "envoy" "alpine_js")
     (#set! injection.combined)
     (#set! injection.language php))
 
-; could be bash or zsh
-; or whatever tree-sitter grammar you have.
 ((text) @injection.content
     (#has-ancestor? @injection.content "envoy")
     (#set! injection.combined)
-    (#set! injection.language bash))
+    (#set! injection.language shell))
 
+((text) @injection.content
+    (#has-ancestor? @injection.content "alpine_js")
+    (#set! injection.combined)
+    (#set! injection.language js))
 
 ((php_only) @injection.content
     (#set! injection.language php_only))

diff --git a/src/grammar.json b/src/grammar.json
@@ -42,6 +42,10 @@
         {
           "type": "SYMBOL",
           "name": "text"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "alpine_js"
         }
       ]
     },
@@ -2047,6 +2051,48 @@
         }
       ]
     },
+    "alpine_js": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "PREC",
+            "value": 1,
+            "content": {
+              "type": "PATTERN",
+              "value": "x-[a-zA-Z1-9]+="
+            }
+          }
+        },
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "PREC",
+            "value": 1,
+            "content": {
+              "type": "PATTERN",
+              "value": "[\\\"\\']"
+            }
+          }
+        },
+        {
+          "type": "SYMBOL",
+          "name": "text"
+        },
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "PREC",
+            "value": 1,
+            "content": {
+              "type": "PATTERN",
+              "value": "[\\\"\\']"
+            }
+          }
+        }
+      ]
+    },
     "_directive_body": {
       "type": "REPEAT1",
       "content": {
@@ -2351,7 +2397,7 @@
             "value": -2,
             "content": {
               "type": "PATTERN",
-              "value": "[{}!@()?,-]"
+              "value": "[\\\"\\'x{}!@()?,-]"
             }
           }
         },
@@ -2362,7 +2408,7 @@
             "value": -1,
             "content": {
               "type": "PATTERN",
-              "value": "[^\\s(){!}@-]([^(){!}@,?]*[^{!}()@?,-])?"
+              "value": "[^\\\"\\'\\sx(){!}@-]([^\\\"\\'x(){!}@,?]*[^\\\"\\'x{!}()@?,-])?"
             }
           }
         }

diff --git a/src/node-types.json b/src/node-types.json
@@ -1,4 +1,19 @@
 [
+  {
+    "type": "alpine_js",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "text",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "attribute",
     "named": true,
@@ -34,6 +49,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "alpine_js",
+          "named": true
+        },
         {
           "type": "attribute",
           "named": true
@@ -141,6 +160,10 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "alpine_js",
+          "named": true
+        },
         {
           "type": "attribute",
           "named": true
@@ -236,6 +259,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "alpine_js",
+          "named": true
+        },
         {
           "type": "attribute",
           "named": true
@@ -378,6 +405,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "alpine_js",
+          "named": true
+        },
         {
           "type": "attribute",
           "named": true
@@ -481,6 +512,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "alpine_js",
+          "named": true
+        },
         {
           "type": "attribute",
           "named": true
@@ -626,6 +661,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "alpine_js",
+          "named": true
+        },
         {
           "type": "attribute",
           "named": true
@@ -729,6 +768,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "alpine_js",
+          "named": true
+        },
         {
           "type": "attribute",
           "named": true
@@ -859,6 +902,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "alpine_js",
+          "named": true
+        },
         {
           "type": "attribute",
           "named": true
@@ -981,6 +1028,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "alpine_js",
+          "named": true
+        },
         {
           "type": "attribute",
           "named": true
@@ -1132,6 +1183,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "alpine_js",
+          "named": true
+        },
         {
           "type": "attribute",
           "named": true
@@ -1235,6 +1290,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "alpine_js",
+          "named": true
+        },
         {
           "type": "attribute",
           "named": true
@@ -1338,6 +1397,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "alpine_js",
+          "named": true
+        },
         {
           "type": "attribute",
           "named": true
@@ -1446,6 +1509,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "alpine_js",
+          "named": true
+        },
         {
           "type": "attribute",
           "named": true