Minor grammar updates

cfmleditor · Sep 9, 2024 · a131477 · a131477
1 parent 5b48538
commit a131477
Show file tree

Hide file tree

Showing 14 changed files with 329,450 additions and 301,459 deletions.
diff --git a/cfhtml/package.json b/cfhtml/package.json
@@ -1,6 +1,6 @@
 {
-    "main": "../bindings/node/cfhtml.js",
-    "tree-sitter": [
+  "main": "../bindings/node/cfhtml.js",
+  "tree-sitter": [
     {
       "scope": "source.cfhtml",
       "file-types": [

diff --git a/cfhtml/queries/highlights.scm b/cfhtml/queries/highlights.scm
@@ -101,6 +101,9 @@
 [
   (this)
   (super)
+  (args)
+  (request)
+  (server)
 ] @variable.builtin
 
 ((identifier) @variable.builtin

diff --git a/cfhtml/src/grammar.json b/cfhtml/src/grammar.json
@@ -5552,6 +5552,38 @@
           "type": "SYMBOL",
           "name": "this"
         },
+        {
+          "type": "SYMBOL",
+          "name": "args"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "request"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "variables"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "form"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "url"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "server"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "session"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "application"
+        },
         {
           "type": "SYMBOL",
           "name": "super"
@@ -9766,6 +9798,62 @@
       "type": "STRING",
       "value": "super"
     },
+    "args": {
+      "type": "TOKEN",
+      "content": {
+        "type": "STRING",
+        "value": "arguments"
+      }
+    },
+    "request": {
+      "type": "TOKEN",
+      "content": {
+        "type": "STRING",
+        "value": "request"
+      }
+    },
+    "variables": {
+      "type": "TOKEN",
+      "content": {
+        "type": "STRING",
+        "value": "variables"
+      }
+    },
+    "form": {
+      "type": "TOKEN",
+      "content": {
+        "type": "STRING",
+        "value": "form"
+      }
+    },
+    "url": {
+      "type": "TOKEN",
+      "content": {
+        "type": "STRING",
+        "value": "url"
+      }
+    },
+    "server": {
+      "type": "TOKEN",
+      "content": {
+        "type": "STRING",
+        "value": "server"
+      }
+    },
+    "session": {
+      "type": "TOKEN",
+      "content": {
+        "type": "STRING",
+        "value": "session"
+      }
+    },
+    "application": {
+      "type": "TOKEN",
+      "content": {
+        "type": "STRING",
+        "value": "application"
+      }
+    },
     "true": {
       "type": "TOKEN",
       "content": {

diff --git a/cfhtml/src/node-types.json b/cfhtml/src/node-types.json
@@ -247,6 +247,14 @@
     "type": "primary_expression",
     "named": true,
     "subtypes": [
+      {
+        "type": "application",
+        "named": true
+      },
+      {
+        "type": "args",
+        "named": true
+      },
       {
         "type": "array",
         "named": true
@@ -263,6 +271,10 @@
         "type": "false",
         "named": true
       },
+      {
+        "type": "form",
+        "named": true
+      },
       {
         "type": "function_expression",
         "named": true
@@ -303,6 +315,18 @@
         "type": "regex",
         "named": true
       },
+      {
+        "type": "request",
+        "named": true
+      },
+      {
+        "type": "server",
+        "named": true
+      },
+      {
+        "type": "session",
+        "named": true
+      },
       {
         "type": "string",
         "named": true
@@ -322,6 +346,14 @@
       {
         "type": "true",
         "named": true
+      },
+      {
+        "type": "url",
+        "named": true
+      },
+      {
+        "type": "variables",
+        "named": true
       }
     ]
   },
@@ -5113,6 +5145,14 @@
     "type": "access_type",
     "named": true
   },
+  {
+    "type": "application",
+    "named": true
+  },
+  {
+    "type": "args",
+    "named": true
+  },
   {
     "type": "argument",
     "named": false
@@ -5233,6 +5273,10 @@
     "type": "for",
     "named": false
   },
+  {
+    "type": "form",
+    "named": true
+  },
   {
     "type": "from",
     "named": false
@@ -5365,6 +5409,10 @@
     "type": "regex_pattern",
     "named": true
   },
+  {
+    "type": "request",
+    "named": true
+  },
   {
     "type": "required",
     "named": true
@@ -5385,6 +5433,14 @@
     "type": "script",
     "named": false
   },
+  {
+    "type": "server",
+    "named": true
+  },
+  {
+    "type": "session",
+    "named": true
+  },
   {
     "type": "set",
     "named": false
@@ -5473,10 +5529,18 @@
     "type": "type",
     "named": true
   },
+  {
+    "type": "url",
+    "named": true
+  },
   {
     "type": "var",
     "named": false
   },
+  {
+    "type": "variables",
+    "named": true
+  },
   {
     "type": "wddx",
     "named": false