Skip to content

Commit 82f4706

Browse files
authored
fix(js) prevent long series of ///// from freezing (highlightjs#2657)
Resolves highlightjs#2656.
1 parent fb0b19c commit 82f4706

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Big picture:
1010

1111
Language Improvements:
1212

13+
- fix(js) Prevent long series of /////// from causing freezes (#2656) [Josh Goebel][]
1314
- enh(csharp) Add `init` and `record` keywords for C# 9.0 (#2660) [Youssef Victor][]
1415
- enh(matlab) Add new R2019b `arguments` keyword and fix `enumeration` keyword (#2619) [Andrew Janke][]
1516
- fix(kotlin) Remove very old keywords and update example code (#2623) [kageru][]

src/languages/javascript.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ export default function(hljs) {
164164
regex.lookahead(regex.concat(
165165
// we also need to allow for multiple possible comments inbetween
166166
// the first key:value pairing
167-
/(((\/\/.*)|(\/\*(.|\n)*\*\/))\s*)*/,
167+
/(((\/\/.*$)|(\/\*(.|\n)*\*\/))\s*)*/,
168168
IDENT_RE + '\\s*:'))),
169169
relevance: 0,
170170
contains: [

0 commit comments

Comments
 (0)