chore: update js comment syntax highlighting

marko-js · Aug 2, 2022 · 3041a4e · 3041a4e
1 parent 7106de4
commit 3041a4e
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 11 deletions.
diff --git a/.changeset/gorgeous-icons-own.md b/.changeset/gorgeous-icons-own.md
@@ -0,0 +1,6 @@
+---
+"marko-vscode": patch
+"@marko/language-server": patch
+---
+
+Improve syntax highlighting for JS style comments in html blocks.
diff --git a/clients/vscode/syntaxes/marko.tmLanguage.json b/clients/vscode/syntaxes/marko.tmLanguage.json
@@ -157,7 +157,7 @@
             { "include": "#cdata" },
             { "include": "#doctype" },
             { "include": "#declaration" },
-            { "include": "#javascript-comments" },
+            { "include": "#javascript-comments-after-whitespace" },
             { "include": "#html-comment" },
             { "include": "#tag-html" },
             {
@@ -505,7 +505,7 @@
         { "include": "#cdata" },
         { "include": "#doctype" },
         { "include": "#declaration" },
-        { "include": "#javascript-comments" },
+        { "include": "#javascript-comments-after-whitespace" },
         { "include": "#html-comment" },
         { "include": "#invalid-close-tag" },
         { "include": "#tag-html" },
@@ -630,6 +630,25 @@
         }
       ]
     },
+    "javascript-comments-after-whitespace": {
+      "patterns": [
+        {
+          "comment": "JavaScript /* block comment */",
+          "contentName": "source.ts",
+          "begin": "(?:^|\\s+)(?=/\\*)",
+          "end": "(?<=\\*/)",
+          "patterns": [{ "include": "source.ts" }]
+        },
+        {
+          "comment": "JavaScript // single line comment",
+          "contentName": "source.ts",
+          "match": "(?:^|\\s+)//.*$",
+          "captures": {
+            "0": { "patterns": [{ "include": "source.ts" }] }
+          }
+        }
+      ]
+    },
     "javascript-expression": {
       "comment": "Matches JavaScript source code, but always continues for certain types of expressions.",
       "patterns": [

diff --git a/package-lock.json b/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -10,7 +10,7 @@
     "@marko/babel-utils": "^5.21.2",
     "@marko/compiler": "^5.22.2",
     "@marko/translator-default": "^5.21.4",
-    "htmljs-parser": "^5.1.0",
+    "htmljs-parser": "^5.1.1",
     "lasso-package-root": "^1.0.1",
     "marko": "^5.21.5",
     "prettier": "^2.7.1",