Skip to content

fix(parser) complete fix for resuming matches from same index #2678

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

Merged
joshgoebel merged 9 commits into from
Sep 17, 2020
Merged

fix(parser) complete fix for resuming matches from same index #2678

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6a37f3c
fix(parser) complete fix for resuming matches from same index
joshgoebel Sep 9, 2020
50ed057
wip
joshgoebel Sep 9, 2020
3836d7e
clean up nesting
joshgoebel Sep 9, 2020
be54ced
remove unnecesary code
joshgoebel Sep 9, 2020
992984e
simplify check to only position 0
joshgoebel Sep 9, 2020
5bb88db
avoid extra work
joshgoebel Sep 9, 2020
4db8f6d
Merge branch 'master' into resume-is-so-complex
joshgoebel Sep 17, 2020
c91fb35
Merge branch 'master' into resume-is-so-complex
joshgoebel Sep 17, 2020
a30a039
Update package.json
joshgoebel Sep 17, 2020
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
Prev Previous commit
Next Next commit
clean up nesting
  • Loading branch information
@joshgoebel
joshgoebel committed Sep 9, 2020
commit 3836d7e0b802f662e2a959738af746c01bfdeb95
13 changes: 7 additions & 6 deletions src/lib/mode_compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ export function compileLanguage(language) {
}

resumingScanAtSamePosition() {
return this.regexIndex != 0;
return this.regexIndex !== 0;
}

considerAll() {
Expand Down Expand Up @@ -198,11 +198,12 @@ export function compileLanguage(language) {
const m2 = this.getMatcher(0);
m2.lastIndex = this.lastIndex + 1;
result2 = m2.exec(s);
}
if ((!result && result2)
|| (result && result2 && result2.index < result.index)) {
result = result2;
this.considerAll();

if ((!result && result2)
|| (result && result2 && result2.index < result.index)) {
result = result2;
this.considerAll();
}
}

if (result) {
Expand Down