Skip to content

chore(locators): rewrite locator parser with per-language parsers #42895

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
Yury Semikhatsky (yury-s) merged 4 commits into from
Sep 24, 2026
Merged

chore(locators): rewrite locator parser with per-language parsers #42895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77a601b
chore(locators): rewrite locator parser with per-language parsers
yury-s Sep 23, 2026
047ebb5
chore(locators): parse locators straight into ParsedSelector
yury-s Sep 23, 2026
f102bed
chore(locators): return parsed selector without round-trip check
yury-s Sep 24, 2026
3bfca2d
chore(locators): make parseRegex abstract and drop redundant comments
yury-s Sep 24, 2026
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
19 changes: 16 additions & 3 deletions packages/isomorphic/locatorGenerators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ export class PythonLocatorFactory implements LocatorFactory {
}

private regexToString(body: RegExp) {
const suffix = body.flags.includes('i') ? ', re.IGNORECASE' : '';
const suffix = regexFlagsSuffix(body, 're', regexFlagNames.python);
return `re.compile(r"${normalizeEscapedRegexQuotes(body.source).replace(/\\\//, '/').replace(/"/g, '\\"')}"${suffix})`;
}

Expand Down Expand Up @@ -605,7 +605,7 @@ export class JavaLocatorFactory implements LocatorFactory {
}

private regexToString(body: RegExp) {
const suffix = body.flags.includes('i') ? ', Pattern.CASE_INSENSITIVE' : '';
const suffix = regexFlagsSuffix(body, 'Pattern', regexFlagNames.java);
return `Pattern.compile(${this.quote(normalizeEscapedRegexQuotes(body.source))}${suffix})`;
}

Expand Down Expand Up @@ -711,7 +711,7 @@ export class CSharpLocatorFactory implements LocatorFactory {
}

private regexToString(body: RegExp): string {
const suffix = body.flags.includes('i') ? ', RegexOptions.IgnoreCase' : '';
const suffix = regexFlagsSuffix(body, 'RegexOptions', regexFlagNames.csharp);
return `new Regex(${this.quote(normalizeEscapedRegexQuotes(body.source))}${suffix})`;
}

Expand Down Expand Up @@ -776,6 +776,19 @@ const generators: Record<Language, new (preferredQuote?: Quote) => LocatorFactor
jsonl: JsonlLocatorFactory,
};

// Regular expression flags supported by the Python, Java and C# locators.
export const regexFlagNames = {
python: { i: 'IGNORECASE', m: 'MULTILINE', s: 'DOTALL' },
java: { i: 'CASE_INSENSITIVE', m: 'MULTILINE', s: 'DOTALL' },
csharp: { i: 'IgnoreCase', m: 'Multiline', s: 'Singleline' },
};

// E.g. `, re.IGNORECASE | re.MULTILINE`.
function regexFlagsSuffix(body: RegExp, flagsEnum: string, names: Record<string, string>): string {
const flags = [...body.flags].filter(flag => flag in names).map(flag => `${flagsEnum}.${names[flag]}`);
return flags.length ? `, ${flags.join(' | ')}` : '';
}

function isRegExp(obj: any): obj is RegExp {
return obj instanceof RegExp;
}
Loading
Loading