Merge pull request m-novikov#50 from immanuelhume/multiline-comments

Improve grammar for comments

Author: DerekStride

grammar.js

@@ -294,8 +294,9 @@ module.exports = grammar({
     char: $ => parametric_type($, $.keyword_char),
     varchar: $ => parametric_type($, $.keyword_varchar),
 
-    comment: _ => /--.*\n/,
-    marginalia: _ => /\/'*.*\*\//,
+    comment: _ => seq('--', /.*\n/),
+    // https://stackoverflow.com/questions/13014947/regex-to-match-a-c-style-multiline-comment
+    marginalia: _ => seq('/*', /[^*]*\*+(?:[^/*][^*]*\*+)*/, '/' ),
 
     statement: $ => seq(
       choice(

src/grammar.json

@@ -1499,12 +1499,34 @@
       ]
     },
     "comment": {
-      "type": "PATTERN",
-      "value": "--.*\\n"
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "--"
+        },
+        {
+          "type": "PATTERN",
+          "value": ".*\\n"
+        }
+      ]
     },
     "marginalia": {
-      "type": "PATTERN",
-      "value": "\\/'*.*\\*\\/"
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "/*"
+        },
+        {
+          "type": "PATTERN",
+          "value": "[^*]*\\*+(?:[^/*][^*]*\\*+)*"
+        },
+        {
+          "type": "STRING",
+          "value": "/"
+        }
+      ]
     },
     "statement": {
       "type": "SEQ",

src/node-types.json

@@ -1261,6 +1261,11 @@
       ]
     }
   },
+  {
+    "type": "comment",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "constraint",
     "named": true,
@@ -2652,6 +2657,11 @@
       ]
     }
   },
+  {
+    "type": "marginalia",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "numeric",
     "named": true,
@@ -3969,6 +3979,10 @@
     "type": "-",
     "named": false
   },
+  {
+    "type": "--",
+    "named": false
+  },
   {
     "type": ".",
     "named": false
@@ -3977,6 +3991,10 @@
     "type": "/",
     "named": false
   },
+  {
+    "type": "/*",
+    "named": false
+  },
   {
     "type": "::",
     "named": false
@@ -4017,10 +4035,6 @@
     "type": "`",
     "named": false
   },
-  {
-    "type": "comment",
-    "named": true
-  },
   {
     "type": "keyword_add",
     "named": true
@@ -4521,10 +4535,6 @@
     "type": "keyword_xml",
     "named": true
   },
-  {
-    "type": "marginalia",
-    "named": true
-  },
   {
     "type": "||",
     "named": false