Skip to content

Commit 0a3932f

Browse files
C-like: Made all comments greedy (#2680)
1 parent cdb24ab commit 0a3932f

File tree

6 files changed

+22
-12
lines changed

6 files changed

+22
-12
lines changed

components/prism-clike.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ Prism.languages.clike = {
22
'comment': [
33
{
44
pattern: /(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,
5-
lookbehind: true
5+
lookbehind: true,
6+
greedy: true
67
},
78
{
89
pattern: /(^|[^\\:])\/\/.*/,

components/prism-clike.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/prism-coffeescript.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ Prism.languages.insertBefore('coffeescript', 'string', {
5858
pattern: /^`|`$/,
5959
alias: 'punctuation'
6060
},
61-
rest: Prism.languages.javascript
61+
'script': {
62+
pattern: /[\s\S]+/,
63+
alias: 'language-javascript',
64+
inside: Prism.languages.javascript
65+
}
6266
}
6367
},
6468

@@ -89,4 +93,4 @@ Prism.languages.insertBefore('coffeescript', 'keyword', {
8993
delete Prism.languages.coffeescript['template-string'];
9094

9195
Prism.languages.coffee = Prism.languages.coffeescript;
92-
}(Prism));
96+
}(Prism));

components/prism-coffeescript.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

prism.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1432,7 +1432,8 @@ Prism.languages.clike = {
14321432
'comment': [
14331433
{
14341434
pattern: /(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,
1435-
lookbehind: true
1435+
lookbehind: true,
1436+
greedy: true
14361437
},
14371438
{
14381439
pattern: /(^|[^\\:])\/\/.*/,

tests/languages/coffeescript/inline-javascript_feature.test

+10-6
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,20 @@ JS here */`
77
[
88
["inline-javascript", [
99
["delimiter", "`"],
10-
["comment", "/* JS here */"],
10+
["script", [
11+
["comment", "/* JS here */"]
12+
]],
1113
["delimiter", "`"]
1214
]],
1315
["inline-javascript", [
14-
["delimiter", "`"],
15-
["comment", "/*\r\nJS here */"],
16-
["delimiter", "`"]
17-
]]
16+
["delimiter", "`"],
17+
["script", [
18+
["comment", "/*\r\nJS here */"]
19+
]],
20+
["delimiter", "`"]
21+
]]
1822
]
1923

2024
----------------------------------------------------
2125

22-
Checks for inline JavaScript.
26+
Checks for inline JavaScript.

0 commit comments

Comments
 (0)