feat: structure comment node similar to string

tree-sitter-grammars · Aug 13, 2023 · fbd70e8 · fbd70e8
1 parent 7268c1c
commit fbd70e8
Show file tree

Hide file tree

Showing 5 changed files with 2,441 additions and 2,448 deletions.
diff --git a/grammar.js b/grammar.js
@@ -553,16 +553,13 @@ module.exports = grammar({
     comment: ($) =>
       choice(
         seq(
-          field('start', alias('--', 'comment_start')),
-          field('content', alias(/[^\r\n]*/, 'comment_content'))
+          field('start', '--'),
+          field('content', alias(/[^\r\n]*/, $.comment_content))
         ),
         seq(
-          field('start', alias($._block_comment_start, 'comment_start')),
-          field(
-            'content',
-            optional(alias($._block_comment_content, 'comment_content'))
-          ),
-          field('end', alias($._block_comment_end, 'comment_end'))
+          field('start', alias($._block_comment_start, '[[')),
+          field('content', alias($._block_comment_content, $.comment_content)),
+          field('end', alias($._block_comment_end, ']]'))
         )
       ),
   },

diff --git a/src/grammar.json b/src/grammar.json
@@ -2982,13 +2982,8 @@
               "type": "FIELD",
               "name": "start",
               "content": {
-                "type": "ALIAS",
-                "content": {
-                  "type": "STRING",
-                  "value": "--"
-                },
-                "named": false,
-                "value": "comment_start"
+                "type": "STRING",
+                "value": "--"
               }
             },
             {
@@ -3000,7 +2995,7 @@
                   "type": "PATTERN",
                   "value": "[^\\r\\n]*"
                 },
-                "named": false,
+                "named": true,
                 "value": "comment_content"
               }
             }
@@ -3019,28 +3014,20 @@
                   "name": "_block_comment_start"
                 },
                 "named": false,
-                "value": "comment_start"
+                "value": "[["
               }
             },
             {
               "type": "FIELD",
               "name": "content",
               "content": {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "ALIAS",
-                    "content": {
-                      "type": "SYMBOL",
-                      "name": "_block_comment_content"
-                    },
-                    "named": false,
-                    "value": "comment_content"
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
+                "type": "ALIAS",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "_block_comment_content"
+                },
+                "named": true,
+                "value": "comment_content"
               }
             },
             {
@@ -3053,7 +3040,7 @@
                   "name": "_block_comment_end"
                 },
                 "named": false,
-                "value": "comment_end"
+                "value": "]]"
               }
             }
           ]

diff --git a/src/node-types.json b/src/node-types.json
@@ -300,11 +300,11 @@
     "fields": {
       "content": {
         "multiple": false,
-        "required": false,
+        "required": true,
         "types": [
           {
             "type": "comment_content",
-            "named": false
+            "named": true
           }
         ]
       },
@@ -313,7 +313,7 @@
         "required": false,
         "types": [
           {
-            "type": "comment_end",
+            "type": "]]",
             "named": false
           }
         ]
@@ -323,7 +323,11 @@
         "required": true,
         "types": [
           {
-            "type": "comment_start",
+            "type": "--",
+            "named": false
+          },
+          {
+            "type": "[[",
             "named": false
           }
         ]
@@ -1085,6 +1089,10 @@
     "type": "-",
     "named": false
   },
+  {
+    "type": "--",
+    "named": false
+  },
   {
     "type": ".",
     "named": false
@@ -1175,15 +1183,7 @@
   },
   {
     "type": "comment_content",
-    "named": false
-  },
-  {
-    "type": "comment_end",
-    "named": false
-  },
-  {
-    "type": "comment_start",
-    "named": false
+    "named": true
   },
   {
     "type": "do",