Skip to content

refactor(linter/plugins): add regex field to all tokens #19894

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
graphite-app merged 1 commit into from
Mar 1, 2026
Merged

refactor(linter/plugins): add regex field to all tokens #19894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 17 additions & 22 deletions apps/oxlint/src-js/plugins/tokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export type Token =

interface BaseToken extends Span {
value: string;
regex: undefined;
}

export interface BooleanToken extends BaseToken {
Expand Down Expand Up @@ -104,8 +105,9 @@ export interface PunctuatorToken extends BaseToken {
type: "Punctuator";
}

export interface RegularExpressionToken extends BaseToken {
export interface RegularExpressionToken extends Span {
type: "RegularExpression";
value: string;
regex: {
pattern: string;
flags: string;
Expand Down Expand Up @@ -213,36 +215,29 @@ function deserializeToken(pos: number): Token {

const kind = buffer![pos + KIND_FIELD_OFFSET];

if (kind === REGEXP_KIND) {
let regex: RegularExpressionToken["regex"] | undefined;
if (kind <= PRIVATE_IDENTIFIER_KIND) {
// Strip leading `#` from private identifiers
if (kind === PRIVATE_IDENTIFIER_KIND) value = value.slice(1);

// Unescape if `escaped` flag is set
if (buffer![pos + IS_ESCAPED_FIELD_OFFSET] === 1) {
value = unescapeIdentifier(value);
}
} else if (kind === REGEXP_KIND) {
const patternEnd = value.lastIndexOf("/");
return {
// @ts-expect-error - TS doesn't understand `__proto__`
__proto__: TokenProto,
type: "RegularExpression",
value,
regex: {
pattern: value.slice(1, patternEnd),
flags: value.slice(patternEnd + 1),
},
start,
end,
range: [start, end],
regex = {
pattern: value.slice(1, patternEnd),
flags: value.slice(patternEnd + 1),
};
}

// Strip leading `#` from private identifiers
if (kind === PRIVATE_IDENTIFIER_KIND) value = value.slice(1);

// Unescape identifiers, keywords, and private identifiers
if (kind <= PRIVATE_IDENTIFIER_KIND && buffer![pos + IS_ESCAPED_FIELD_OFFSET] === 1) {
value = unescapeIdentifier(value);
}

return {
// @ts-expect-error - TS doesn't understand `__proto__`
__proto__: TokenProto,
type: TOKEN_TYPES[kind],
value,
regex,
start,
end,
range: [start, end],
Expand Down
Loading
Loading