Skip to content

Correct regular expression flags scanning for non-BMP characters #58612

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 5 commits into from
Jun 4, 2024
Merged

Correct regular expression flags scanning for non-BMP characters #58612

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0725a3a
Correct flags scanning for non-BMP characters
graphemecluster May 22, 2024
f91f83f
Merge branch 'main' into regex-non-bmp-flags
graphemecluster May 30, 2024
406468c
Optimization: Lookup by `CharacterCodes`
graphemecluster May 30, 2024
723b1d6
Add remarks to test case file
rbuckton May 31, 2024
15783d6
Merge branch 'main' into regex-non-bmp-flags
graphemecluster May 31, 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
66 changes: 34 additions & 32 deletions src/compiler/scanner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,16 +282,16 @@ const textToToken = new Map(Object.entries({
"`": SyntaxKind.BacktickToken,
}));

const charToRegExpFlag = new Map(Object.entries({
d: RegularExpressionFlags.HasIndices,
g: RegularExpressionFlags.Global,
i: RegularExpressionFlags.IgnoreCase,
m: RegularExpressionFlags.Multiline,
s: RegularExpressionFlags.DotAll,
u: RegularExpressionFlags.Unicode,
v: RegularExpressionFlags.UnicodeSets,
y: RegularExpressionFlags.Sticky,
}));
const charCodeToRegExpFlag = new Map<CharacterCodes, RegularExpressionFlags>([
[CharacterCodes.d, RegularExpressionFlags.HasIndices],
[CharacterCodes.g, RegularExpressionFlags.Global],
[CharacterCodes.i, RegularExpressionFlags.IgnoreCase],
[CharacterCodes.m, RegularExpressionFlags.Multiline],
[CharacterCodes.s, RegularExpressionFlags.DotAll],
[CharacterCodes.u, RegularExpressionFlags.Unicode],
[CharacterCodes.v, RegularExpressionFlags.UnicodeSets],
[CharacterCodes.y, RegularExpressionFlags.Sticky],
]);

const regExpFlagToFirstAvailableLanguageVersion = new Map<RegularExpressionFlags, LanguageFeatureMinimumTarget>([
[RegularExpressionFlags.HasIndices, LanguageFeatureMinimumTarget.RegularExpressionFlagsHasIndices],
Expand Down Expand Up @@ -394,8 +394,8 @@ function isUnicodeIdentifierPart(code: number, languageVersion: ScriptTarget | u
lookupInUnicodeMap(code, unicodeES5IdentifierPart);
}

function makeReverseMap(source: Map<string, number>): string[] {
const result: string[] = [];
function makeReverseMap<T>(source: Map<T, number>): T[] {
const result: T[] = [];
source.forEach((value, name) => {
result[value] = name;
});
Expand All @@ -416,16 +416,16 @@ export function stringToToken(s: string): SyntaxKind | undefined {
return textToToken.get(s);
}

const regExpFlagChars = makeReverseMap(charToRegExpFlag);
const regExpFlagCharCodes = makeReverseMap(charCodeToRegExpFlag);

/** @internal */
export function regularExpressionFlagToCharacter(f: RegularExpressionFlags): string | undefined {
return regExpFlagChars[f];
export function regularExpressionFlagToCharacterCode(f: RegularExpressionFlags): CharacterCodes | undefined {
return regExpFlagCharCodes[f];
}

/** @internal */
export function characterToRegularExpressionFlag(c: string): RegularExpressionFlags | undefined {
return charToRegExpFlag.get(c);
export function characterCodeToRegularExpressionFlag(ch: CharacterCodes): RegularExpressionFlags | undefined {
return charCodeToRegExpFlag.get(ch);
}

/** @internal */
Expand Down Expand Up @@ -2562,23 +2562,24 @@ export function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean
if (ch === CharacterCodes.EOF || !isIdentifierPart(ch, languageVersion)) {
break;
}
const size = charSize(ch);
if (reportErrors) {
const flag = characterToRegularExpressionFlag(String.fromCharCode(ch));
const flag = characterCodeToRegularExpressionFlag(ch);
if (flag === undefined) {
error(Diagnostics.Unknown_regular_expression_flag, pos, 1);
error(Diagnostics.Unknown_regular_expression_flag, pos, size);
}
else if (regExpFlags & flag) {
error(Diagnostics.Duplicate_regular_expression_flag, pos, 1);
error(Diagnostics.Duplicate_regular_expression_flag, pos, size);
}
else if (((regExpFlags | flag) & RegularExpressionFlags.AnyUnicodeMode) === RegularExpressionFlags.AnyUnicodeMode) {
error(Diagnostics.The_Unicode_u_flag_and_the_Unicode_Sets_v_flag_cannot_be_set_simultaneously, pos, 1);
error(Diagnostics.The_Unicode_u_flag_and_the_Unicode_Sets_v_flag_cannot_be_set_simultaneously, pos, size);
}
else {
regExpFlags |= flag;
checkRegularExpressionFlagAvailable(flag, pos);
checkRegularExpressionFlagAvailability(flag, size);
}
}
pos++;
pos += size;
}
if (reportErrors) {
scanRange(startOfRegExpBody, endOfRegExpBody - startOfRegExpBody, () => {
Expand Down Expand Up @@ -2843,25 +2844,26 @@ export function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean

function scanPatternModifiers(currFlags: RegularExpressionFlags): RegularExpressionFlags {
while (true) {
const ch = charCodeChecked(pos);
const ch = codePointChecked(pos);
if (ch === CharacterCodes.EOF || !isIdentifierPart(ch, languageVersion)) {
break;
}
const flag = characterToRegularExpressionFlag(String.fromCharCode(ch));
const size = charSize(ch);
const flag = characterCodeToRegularExpressionFlag(ch);
if (flag === undefined) {
error(Diagnostics.Unknown_regular_expression_flag, pos, 1);
error(Diagnostics.Unknown_regular_expression_flag, pos, size);
}
else if (currFlags & flag) {
error(Diagnostics.Duplicate_regular_expression_flag, pos, 1);
error(Diagnostics.Duplicate_regular_expression_flag, pos, size);
}
else if (!(flag & RegularExpressionFlags.Modifiers)) {
error(Diagnostics.This_regular_expression_flag_cannot_be_toggled_within_a_subpattern, pos, 1);
error(Diagnostics.This_regular_expression_flag_cannot_be_toggled_within_a_subpattern, pos, size);
}
else {
currFlags |= flag;
checkRegularExpressionFlagAvailable(flag, pos);
checkRegularExpressionFlagAvailability(flag, size);
}
pos++;
pos += size;
}
return currFlags;
}
Expand Down Expand Up @@ -3583,10 +3585,10 @@ export function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean
});
}

function checkRegularExpressionFlagAvailable(flag: RegularExpressionFlags, pos: number) {
function checkRegularExpressionFlagAvailability(flag: RegularExpressionFlags, size: number) {
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));
error(Diagnostics.This_regular_expression_flag_is_only_available_when_targeting_0_or_later, pos, size, getNameOfScriptTarget(availableFrom));
}
}

Expand Down
23 changes: 23 additions & 0 deletions tests/baselines/reference/regularExpressionWithNonBMPFlags.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
regularExpressionWithNonBMPFlags.ts(1,23): error TS1499: Unknown regular expression flag.
regularExpressionWithNonBMPFlags.ts(1,25): error TS1499: Unknown regular expression flag.
regularExpressionWithNonBMPFlags.ts(1,28): error TS1499: Unknown regular expression flag.
regularExpressionWithNonBMPFlags.ts(1,41): error TS1499: Unknown regular expression flag.
regularExpressionWithNonBMPFlags.ts(1,43): error TS1499: Unknown regular expression flag.
regularExpressionWithNonBMPFlags.ts(1,45): error TS1499: Unknown regular expression flag.


==== regularExpressionWithNonBMPFlags.ts (6 errors) ====
const 𝘳𝘦𝘨𝘦𝘹 = /(?𝘴𝘪-𝘮:^𝘧𝘰𝘰.)/𝘨𝘮𝘶;
~~
!!! error TS1499: Unknown regular expression flag.
~~
!!! error TS1499: Unknown regular expression flag.
~~
!!! error TS1499: Unknown regular expression flag.
~~
!!! error TS1499: Unknown regular expression flag.
~~
!!! error TS1499: Unknown regular expression flag.
~~
!!! error TS1499: Unknown regular expression flag.

8 changes: 8 additions & 0 deletions tests/baselines/reference/regularExpressionWithNonBMPFlags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//// [tests/cases/compiler/regularExpressionWithNonBMPFlags.ts] ////

//// [regularExpressionWithNonBMPFlags.ts]
const 𝘳𝘦𝘨𝘦𝘹 = /(?𝘴𝘪-𝘮:^𝘧𝘰𝘰.)/𝘨𝘮𝘶;


//// [regularExpressionWithNonBMPFlags.js]
const 𝘳𝘦𝘨𝘦𝘹 = /(?𝘴𝘪-𝘮:^𝘧𝘰𝘰.)/𝘨𝘮𝘶;
6 changes: 6 additions & 0 deletions tests/baselines/reference/regularExpressionWithNonBMPFlags.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
//// [tests/cases/compiler/regularExpressionWithNonBMPFlags.ts] ////

=== regularExpressionWithNonBMPFlags.ts ===
const 𝘳𝘦𝘨𝘦𝘹 = /(?𝘴𝘪-𝘮:^𝘧𝘰𝘰.)/𝘨𝘮𝘶;
>𝘳𝘦𝘨𝘦𝘹 : Symbol(𝘳𝘦𝘨𝘦𝘹, Decl(regularExpressionWithNonBMPFlags.ts, 0, 5))

9 changes: 9 additions & 0 deletions tests/baselines/reference/regularExpressionWithNonBMPFlags.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//// [tests/cases/compiler/regularExpressionWithNonBMPFlags.ts] ////

=== regularExpressionWithNonBMPFlags.ts ===
const 𝘳𝘦𝘨𝘦𝘹 = /(?𝘴𝘪-𝘮:^𝘧𝘰𝘰.)/𝘨𝘮𝘶;
>𝘳𝘦𝘨𝘦𝘹 : RegExp
> : ^^^^^^
>/(?𝘴𝘪-𝘮:^𝘧𝘰𝘰.)/𝘨𝘮𝘶 : RegExp
> : ^^^^^^

3 changes: 3 additions & 0 deletions tests/cases/compiler/regularExpressionWithNonBMPFlags.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// @target: esnext

const 𝘳𝘦𝘨𝘦𝘹 = /(?𝘴𝘪-𝘮:^𝘧𝘰𝘰.)/𝘨𝘮𝘶;
Comment thread
graphemecluster marked this conversation as resolved.