Skip to content

Improve Recovery of Unterminated Regular Expressions #58289

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
rbuckton merged 11 commits into from
May 24, 2024
Merged

Improve Recovery of Unterminated Regular Expressions #58289

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ff858bc
Improve Recovery of Unterminated Regular Expressions
graphemecluster Apr 22, 2024
c7b65ac
Merge branch 'main' into regex-recovery
graphemecluster Apr 25, 2024
a7621e0
Unrevert the change to incremental parser test
graphemecluster Apr 25, 2024
f1aa06f
Revert the change to `parseErrorAtPosition` in `parser.ts`
graphemecluster Apr 25, 2024
978e195
I’m very wrong
graphemecluster Apr 25, 2024
5c75b2d
Merge branch 'main' into regex-recovery
graphemecluster Apr 25, 2024
76acd92
Use `scanRange` to prevent variable shadowing
graphemecluster Apr 27, 2024
e67692a
Correct flags scanning for non-BMP characters
graphemecluster Apr 27, 2024
0247ea8
Merge branch 'main' into regex-recovery
rbuckton May 16, 2024
11ad5f5
Revert "Correct flags scanning for non-BMP characters"
graphemecluster May 21, 2024
77235de
Apply Suggested Changes
graphemecluster May 22, 2024
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
Merge branch 'main' into regex-recovery
  • Loading branch information
@graphemecluster
graphemecluster committed Apr 25, 2024
commit 5c75b2dc0901317773e3087194300cf238ad4717
9 changes: 3 additions & 6 deletions src/compiler/scanner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2502,10 +2502,7 @@ export function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean
}
else {
regExpFlags |= flag;
const availableFrom = regExpFlagToFirstAvailableLanguageVersion.get(flag)!;
if (languageVersion < availableFrom) {
error(Diagnostics.This_regular_expression_flag_is_only_available_when_targeting_0_or_later, pos, 1, getNameOfScriptTarget(availableFrom));
}
checkRegularExpressionFlagAvailable(flag);
}
}
pos++;
Expand Down Expand Up @@ -2776,7 +2773,7 @@ export function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean
}
else {
currFlags |= flag;
checkRegularExpressionFlagAvailable(flag, pos);
checkRegularExpressionFlagAvailable(flag);
}
pos++;
}
Expand Down Expand Up @@ -3478,7 +3475,7 @@ export function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean
});
}

function checkRegularExpressionFlagAvailable(flag: RegularExpressionFlags, pos: number) {
function checkRegularExpressionFlagAvailable(flag: RegularExpressionFlags) {
const availableFrom = regExpFlagToFirstAvailableLanguageVersion.get(flag) as ScriptTarget | undefined;
if (availableFrom && languageVersion < availableFrom) {
error(Diagnostics.This_regular_expression_flag_is_only_available_when_targeting_0_or_later, pos, 1, getNameOfScriptTarget(availableFrom));
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.