Skip to content

Commit b37987d

Browse files
RunDevelopmentRunDevelopment
authored
Core: Fixed greedy rematching reach bug (#2705)
1 parent 3f7d745 commit b37987d

File tree

6 files changed

+105
-11
lines changed

6 files changed

+105
-11
lines changed

‎components/prism-core.js

+10-2
Original file line numberDiff line numberDiff line change
@@ -984,10 +984,18 @@ function matchGrammar(text, tokenList, grammar, startNode, startPos, rematch) {
984984
if (removeCount > 1) {
985985
// at least one Token object was removed, so we have to do some rematching
986986
// this can only happen if the current pattern is greedy
987-
matchGrammar(text, tokenList, grammar, currentNode.prev, pos, {
987+
988+
/** @type {RematchOptions} */
989+
var nestedRematch = {
988990
cause: token + ',' + j,
989991
reach: reach
990-
});
992+
};
993+
matchGrammar(text, tokenList, grammar, currentNode.prev, pos, nestedRematch);
994+
995+
// the reach might have been extended because of the rematching
996+
if (rematch && nestedRematch.reach > rematch.reach) {
997+
rematch.reach = nestedRematch.reach;
998+
}
991999
}
9921000
}
9931001
}

‎components/prism-core.min.js

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

‎docs/global.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ <h4 class="name" id="Grammar">Grammar</h4>
143143

144144
<dt class="tag-source">Source:</dt>
145145
<dd class="tag-source"><ul class="dummy"><li>
146-
<a href="prism-core.js.html">prism-core.js</a>, <a href="prism-core.js.html#line1171">line 1171</a>
146+
<a href="prism-core.js.html">prism-core.js</a>, <a href="prism-core.js.html#line1179">line 1179</a>
147147
</li></ul></dd>
148148

149149

@@ -274,7 +274,7 @@ <h4 class="name" id="GrammarToken">GrammarToken</h4>
274274

275275
<dt class="tag-source">Source:</dt>
276276
<dd class="tag-source"><ul class="dummy"><li>
277-
<a href="prism-core.js.html">prism-core.js</a>, <a href="prism-core.js.html#line1150">line 1150</a>
277+
<a href="prism-core.js.html">prism-core.js</a>, <a href="prism-core.js.html#line1158">line 1158</a>
278278
</li></ul></dd>
279279

280280

@@ -559,7 +559,7 @@ <h4 class="name" id="HighlightCallback"><span class="type-signature"></span>High
559559

560560
<dt class="tag-source">Source:</dt>
561561
<dd class="tag-source"><ul class="dummy"><li>
562-
<a href="prism-core.js.html">prism-core.js</a>, <a href="prism-core.js.html#line1179">line 1179</a>
562+
<a href="prism-core.js.html">prism-core.js</a>, <a href="prism-core.js.html#line1187">line 1187</a>
563563
</li></ul></dd>
564564

565565

@@ -713,7 +713,7 @@ <h4 class="name" id="HookCallback"><span class="type-signature"></span>HookCallb
713713

714714
<dt class="tag-source">Source:</dt>
715715
<dd class="tag-source"><ul class="dummy"><li>
716-
<a href="prism-core.js.html">prism-core.js</a>, <a href="prism-core.js.html#line1189">line 1189</a>
716+
<a href="prism-core.js.html">prism-core.js</a>, <a href="prism-core.js.html#line1197">line 1197</a>
717717
</li></ul></dd>
718718

719719

‎docs/prism-core.js.html

+10-2
Original file line numberDiff line numberDiff line change
@@ -1037,10 +1037,18 @@ <h1 class="page-title">prism-core.js</h1>
10371037
if (removeCount > 1) {
10381038
// at least one Token object was removed, so we have to do some rematching
10391039
// this can only happen if the current pattern is greedy
1040-
matchGrammar(text, tokenList, grammar, currentNode.prev, pos, {
1040+
1041+
/** @type {RematchOptions} */
1042+
var nestedRematch = {
10411043
cause: token + ',' + j,
10421044
reach: reach
1043-
});
1045+
};
1046+
matchGrammar(text, tokenList, grammar, currentNode.prev, pos, nestedRematch);
1047+
1048+
// the reach might have been extended because of the rematching
1049+
if (rematch &amp;&amp; nestedRematch.reach > rematch.reach) {
1050+
rematch.reach = nestedRematch.reach;
1051+
}
10441052
}
10451053
}
10461054
}

‎prism.js

+10-2
Original file line numberDiff line numberDiff line change
@@ -989,10 +989,18 @@ function matchGrammar(text, tokenList, grammar, startNode, startPos, rematch) {
989989
if (removeCount > 1) {
990990
// at least one Token object was removed, so we have to do some rematching
991991
// this can only happen if the current pattern is greedy
992-
matchGrammar(text, tokenList, grammar, currentNode.prev, pos, {
992+
993+
/** @type {RematchOptions} */
994+
var nestedRematch = {
993995
cause: token + ',' + j,
994996
reach: reach
995-
});
997+
};
998+
matchGrammar(text, tokenList, grammar, currentNode.prev, pos, nestedRematch);
999+
1000+
// the reach might have been extended because of the rematching
1001+
if (rematch && nestedRematch.reach > rematch.reach) {
1002+
rematch.reach = nestedRematch.reach;
1003+
}
9961004
}
9971005
}
9981006
}

‎tests/languages/javascript/issue2694.test

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
replace(/'/, `'`)
2+
3+
const var1 = `this is fine`;
4+
const var2 = `this is fine`;
5+
6+
// `load bearing comment`
7+
8+
const var3 = `break starts here`;
9+
const var4 = `break ends here`;
10+
11+
----------------------------------------------------
12+
13+
[
14+
["function", "replace"],
15+
["punctuation", "("],
16+
["regex", [
17+
["regex-delimiter", "/"],
18+
["regex-source", "'"],
19+
["regex-delimiter", "/"]
20+
]],
21+
["punctuation", ","],
22+
["template-string", [
23+
["template-punctuation", "`"],
24+
["string", "'"],
25+
["template-punctuation", "`"]
26+
]],
27+
["punctuation", ")"],
28+
29+
["keyword", "const"],
30+
" var1 ",
31+
["operator", "="],
32+
["template-string", [
33+
["template-punctuation", "`"],
34+
["string", "this is fine"],
35+
["template-punctuation", "`"]
36+
]],
37+
["punctuation", ";"],
38+
39+
["keyword", "const"],
40+
" var2 ",
41+
["operator", "="],
42+
["template-string", [
43+
["template-punctuation", "`"],
44+
["string", "this is fine"],
45+
["template-punctuation", "`"]
46+
]],
47+
["punctuation", ";"],
48+
49+
["comment", "// `load bearing comment`"],
50+
51+
["keyword", "const"],
52+
" var3 ",
53+
["operator", "="],
54+
["template-string", [
55+
["template-punctuation", "`"],
56+
["string", "break starts here"],
57+
["template-punctuation", "`"]
58+
]],
59+
["punctuation", ";"],
60+
61+
["keyword", "const"],
62+
" var4 ",
63+
["operator", "="],
64+
["template-string", [
65+
["template-punctuation", "`"],
66+
["string", "break ends here"],
67+
["template-punctuation", "`"]
68+
]],
69+
["punctuation", ";"]
70+
]

0 commit comments

Comments
 (0)