fix(javascript/typescript) allow empty block-comments (#2897)

highlightjs · Dec 2, 2020 · 6a0c9f8 · 6a0c9f8
1 parent 612a551
commit 6a0c9f8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -19,6 +19,7 @@ Grammar improvements:
   - Type suffixes: 123UI (unsigned integer)
   - Improves directives detection and adds support for `Enable`, `Disable`, and `Then` keywords
   - Adds more markup tests
+- fix(javascript) Empty block-comments break highlighting (#2896) [Jan Pilzer][]
 - enh(dart) Fix empty block-comments from breaking highlighting (#2898) [Jan Pilzer][]
 - enh(dart) Fix empty doc-comment eating next line [Jan Pilzer][]
 

diff --git a/src/languages/javascript.js b/src/languages/javascript.js
@@ -135,7 +135,7 @@ export default function(hljs) {
     ]
   };
   const JSDOC_COMMENT = hljs.COMMENT(
-    '/\\*\\*',
+    /\/\*\*(?!\/)/,
     '\\*/',
     {
       relevance: 0,

diff --git a/test/markup/javascript/block-comments.expect.txt b/test/markup/javascript/block-comments.expect.txt
@@ -0,0 +1,9 @@
+<span class="hljs-comment">/* Block-Comment */</span>
+
+<span class="hljs-comment">/* Can
+   Be
+   Multi-
+   Line
+*/</span>
+
+<span class="hljs-comment">/**/</span>
diff --git a/test/markup/javascript/block-comments.txt b/test/markup/javascript/block-comments.txt
@@ -0,0 +1,9 @@
+/* Block-Comment */
+
+/* Can
+   Be
+   Multi-
+   Line
+*/
+
+/**/