Add support for regex injections

tgross35 · Jan 7, 2024 · 18eb696 · 18eb696
1 parent 37ae0e3
commit 18eb696
Show file tree

Hide file tree

Showing 8 changed files with 3,065 additions and 2,933 deletions.
diff --git a/grammar.js b/grammar.js
@@ -176,11 +176,14 @@ module.exports = grammar({
       choice(
         seq($.expression, "==", $.expression),
         seq($.expression, "!=", $.expression),
-        seq($.expression, "=~", $.expression),
+        seq($.expression, "=~", choice($.regex_literal, $.expression)),
         // verify whether this is valid
         $.expression,
       ),
 
+    // Capture this special for injections
+    regex_literal: ($) => prec(4, $._string),
+
     // value         : NAME '(' sequence? ')'
     //               | BACKTICK
     //               | INDENTED_BACKTICK

diff --git a/queries-src/injections.scm b/queries-src/injections.scm
@@ -4,6 +4,7 @@
   (#set! injection.language "comment"))
 
 
+; FIXME: read default from shebang
 (recipe_line
     (text) @injection.content
     (#set! injection.language "bash"))
@@ -12,12 +13,9 @@
     (command_body) @injection.content
     (#set! injection.language "bash"))
 
-; ; FIXME: read default from shebang
-; ([
-;     (recipe_body 
-;       (recipe_line (text)))
-;     (external_command
-;         body: (_)*)
-;   ] @injection.content
-;   (#set! injection.language "bash")
-;   )
+((regex_literal
+    [
+        (string_literal)
+        (raw_string_literal)
+    ] @injection.content)
+    (#set! injection.language "regex"))
diff --git a/queries/just/injections.scm b/queries/just/injections.scm
@@ -14,6 +14,11 @@
     (command_body) @injection.content
     (#set! injection.language "bash"))
 
+((regex_literal
+    [(string_literal)
+        (raw_string_literal)] @injection.content)
+    (#set! injection.language "regex"))
+
 ; ; FIXME: read default from shebang
 ; ([
 ;     (recipe_body 

diff --git a/src/grammar.json b/src/grammar.json
@@ -694,8 +694,17 @@
               "value": "=~"
             },
             {
-              "type": "SYMBOL",
-              "name": "expression"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "regex_literal"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              ]
             }
           ]
         },
@@ -705,6 +714,14 @@
         }
       ]
     },
+    "regex_literal": {
+      "type": "PREC",
+      "value": 4,
+      "content": {
+        "type": "SYMBOL",
+        "name": "_string"
+      }
+    },
     "value": {
       "type": "PREC_LEFT",
       "value": 0,

diff --git a/src/node-types.json b/src/node-types.json
@@ -127,6 +127,10 @@
         {
           "type": "expression",
           "named": true
+        },
+        {
+          "type": "regex_literal",
+          "named": true
         }
       ]
     }
@@ -622,6 +626,25 @@
     "named": true,
     "fields": {}
   },
+  {
+    "type": "regex_literal",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "raw_string_literal",
+          "named": true
+        },
+        {
+          "type": "string_literal",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "sequence",
     "named": true,