Revert "Merge pull request tree-sitter#97 from matoous/md/comment-dir…

…ectives" This reverts commit 06432b8, reversing changes made to dfbef73.
matoous · Dec 6, 2022 · 87fadcc · 87fadcc
1 parent 06432b8
commit 87fadcc
Show file tree

Hide file tree

Showing 5 changed files with 23,473 additions and 31,372 deletions.
diff --git a/corpus/source_files.txt b/corpus/source_files.txt
@@ -100,54 +100,6 @@ const d
   (comment)
   (const_declaration (const_spec (identifier))))
 
-================================================================================
-Directive comments
-================================================================================
-
-package main
-
-//extern test_extern
-func testExtern() {}
-
-//export text_export
-func textExport() {}
-
-//line test:123
-type testLine int
-
-//nolint:unused
-type Custom int
-
----
-
-(source_file
-  (package_clause
-    (package_identifier))
-  (comment
-    (directive))
-  (function_declaration
-    (identifier)
-    (parameter_list)
-    (block))
-  (comment
-    (directive))
-  (function_declaration
-    (identifier)
-    (parameter_list)
-    (block))
-  (comment
-    (directive))
-  (type_declaration
-    (type_spec
-      (type_identifier)
-      (type_identifier)))
-  (comment
-    (directive))
-  (type_declaration
-    (type_spec
-      (type_identifier)
-      (type_identifier))))
-
 ============================================
 Non-ascii variable names
 ============================================

diff --git a/grammar.js b/grammar.js
@@ -895,19 +895,15 @@ module.exports = grammar({
     false: $ => 'false',
     iota: $ => 'iota',
 
-    // https://tip.golang.org/doc/comment#syntax
-    directive: $ => token(/(line |extern |export |[a-z0-9]+:[a-z0-9])/),
-
     // http://stackoverflow.com/questions/13014947/regex-to-match-a-c-style-multiline-comment/36328890#36328890
-    comment: $ => choice(
-      seq('//', $.directive, /.*/),
-      seq('// ', /.*/),
+    comment: $ => token(choice(
+      seq('//', /.*/),
       seq(
         '/*',
         /[^*]*\*+([^/*][^*]*\*+)*/,
         '/'
       )
-    )
+    ))
   }
 })
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -6720,64 +6720,43 @@
       "type": "STRING",
       "value": "iota"
     },
-    "directive": {
+    "comment": {
       "type": "TOKEN",
       "content": {
-        "type": "PATTERN",
-        "value": "(line |extern |export |[a-z0-9]+:[a-z0-9])"
+        "type": "CHOICE",
+        "members": [
+          {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "STRING",
+                "value": "//"
+              },
+              {
+                "type": "PATTERN",
+                "value": ".*"
+              }
+            ]
+          },
+          {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "STRING",
+                "value": "/*"
+              },
+              {
+                "type": "PATTERN",
+                "value": "[^*]*\\*+([^/*][^*]*\\*+)*"
+              },
+              {
+                "type": "STRING",
+                "value": "/"
+              }
+            ]
+          }
+        ]
       }
-    },
-    "comment": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "//"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "directive"
-            },
-            {
-              "type": "PATTERN",
-              "value": ".*"
-            }
-          ]
-        },
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "// "
-            },
-            {
-              "type": "PATTERN",
-              "value": ".*"
-            }
-          ]
-        },
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "/*"
-            },
-            {
-              "type": "PATTERN",
-              "value": "[^*]*\\*+([^/*][^*]*\\*+)*"
-            },
-            {
-              "type": "STRING",
-              "value": "/"
-            }
-          ]
-        }
-      ]
     }
   },
   "extras": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -588,21 +588,6 @@
       }
     }
   },
-  {
-    "type": "comment",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "directive",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "communication_case",
     "named": true,
@@ -2618,18 +2603,6 @@
     "type": "/",
     "named": false
   },
-  {
-    "type": "/*",
-    "named": false
-  },
-  {
-    "type": "//",
-    "named": false
-  },
-  {
-    "type": "// ",
-    "named": false
-  },
   {
     "type": "/=",
     "named": false
@@ -2722,6 +2695,10 @@
     "type": "chan",
     "named": false
   },
+  {
+    "type": "comment",
+    "named": true
+  },
   {
     "type": "const",
     "named": false
@@ -2738,10 +2715,6 @@
     "type": "defer",
     "named": false
   },
-  {
-    "type": "directive",
-    "named": true
-  },
   {
     "type": "else",
     "named": false