Skip to content

Request: Support regex look-ahead for begin and end matchers #1349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Request: Support regex look-ahead for begin and end matchers #1349

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4adf4c9
Adds afterBegin and afterEnd tags to perform end-of-element lookahead…
logicplace Nov 14, 2016
bc40ff2
Merge branch 'master' into after-tags
Aug 17, 2019
a6c8b3d
Merge branch 'master' into after-tags
Aug 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions src/highlight.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,13 +328,24 @@ https://highlightjs.org/
}
if (!mode.begin)
mode.begin = /\B|\b/;
mode.beginRe = langRe(mode.begin);
if (mode.endSameAsBegin)
mode.end = mode.begin;
if (mode.afterBegin) {
var rsb = reStr(mode.begin), rsab = reStr(mode.afterBegin);
mode.beginRe = langRe(rsb + '(?=' + rsab + ')');
mode.begin = rsb + '(' + rsab + ')';
} else {
mode.beginRe = langRe(mode.begin);
}
if (!mode.end && !mode.endsWithParent)
mode.end = /\B|\b/;
if (mode.end)
mode.endRe = langRe(mode.end);
if (mode.end) {
if (mode.afterEnd) {
var rse = reStr(mode.end), rsae = reStr(mode.afterEnd);
mode.endRe = langRe(rse + '(?=' + rsae + ')');
mode.end = rse + '(' + rsae + ')';
} else {
mode.endRe = langRe(mode.end);
}
}
mode.terminator_end = reStr(mode.end) || '';
if (mode.endsWithParent && parent.terminator_end)
mode.terminator_end += (mode.end ? '|' : '') + parent.terminator_end;
Expand Down Expand Up @@ -498,6 +509,9 @@ https://highlightjs.org/

var new_mode = subMode(lexeme, top);
if (new_mode) {
if (new_mode.afterBegin) {
lexeme = lexeme.match(new_mode.beginRe)[0];
}
if (new_mode.skip) {
mode_buffer += lexeme;
} else {
Expand All @@ -516,6 +530,9 @@ https://highlightjs.org/
var end_mode = endOfMode(top, lexeme);
if (end_mode) {
var origin = top;
if (origin.afterEnd) {
lexeme = lexeme.match(origin.endRe)[0];
}
if (origin.skip) {
mode_buffer += lexeme;
} else {
Expand Down