Skip to content

perf(linter/plugins): remove branch from token parsing #18369

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
overlookmotel merged 1 commit into from
Jan 21, 2026
Merged

perf(linter/plugins): remove branch from token parsing #18369

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
3 changes: 3 additions & 0 deletions apps/oxlint/src-js/plugins/tokens_parse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,11 @@ function getTokenType(token: ts.Identifier | ts.Token<ts.SyntaxKind>): Token["ty
: "String";
}

/*
// Not needed. Handled in `convertToken` instead.
case tsSyntaxKind.RegularExpressionLiteral:
return "RegularExpression";
*/

case tsSyntaxKind.Identifier: {
// Some JSX tokens have to be determined based on their parent
Expand Down
2 changes: 1 addition & 1 deletion apps/oxlint/test/fixtures/tokens/files/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
let x = /* inline comment */ 1;

// Another comment
let y = 2;
let y = /abc/gu;

// Trailing comment
35 changes: 18 additions & 17 deletions apps/oxlint/test/fixtures/tokens/output.snap.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,15 +343,15 @@
| Keyword loc= 6:0 - 6:3 range= 72-75 "let"
| Identifier loc= 6:4 - 6:5 range= 76-77 "y"
| Punctuator loc= 6:6 - 6:7 range= 78-79 "="
| Numeric loc= 6:8 - 6:9 range= 80-81 "2"
| Punctuator loc= 6:9 - 6:10 range= 81-82 ";"
| RegularExpression loc= 6:8 - 6:15 range= 80-87 "/abc/gu"
| Punctuator loc= 6:15 - 6:16 range= 87-88 ";"
,-[files/index.js:1:1]
1 | ,-> // Leading comment
2 | |
3 | | let x = /* inline comment */ 1;
4 | |
5 | | // Another comment
6 | | let y = 2;
6 | | let y = /abc/gu;
7 | |
8 | `-> // Trailing comment
`----
Expand All @@ -368,16 +368,16 @@
| Keyword loc= 6:0 - 6:3 range= 72-75 "let"
| Identifier loc= 6:4 - 6:5 range= 76-77 "y"
| Punctuator loc= 6:6 - 6:7 range= 78-79 "="
| Numeric loc= 6:8 - 6:9 range= 80-81 "2"
| Punctuator loc= 6:9 - 6:10 range= 81-82 ";"
| Line loc= 8:0 - 8:19 range= 84-103 " Trailing comment"
| RegularExpression loc= 6:8 - 6:15 range= 80-87 "/abc/gu"
| Punctuator loc= 6:15 - 6:16 range= 87-88 ";"
| Line loc= 8:0 - 8:19 range= 90-109 " Trailing comment"
,-[files/index.js:1:1]
1 | ,-> // Leading comment
2 | |
3 | | let x = /* inline comment */ 1;
4 | |
5 | | // Another comment
6 | | let y = 2;
6 | | let y = /abc/gu;
7 | |
8 | `-> // Trailing comment
`----
Expand Down Expand Up @@ -435,46 +435,47 @@
4 |
5 | // Another comment
: ^^^^^^^^^^^^^^^^^^
6 | let y = 2;
6 | let y = /abc/gu;
`----

x tokens-plugin(tokens): Keyword ("let")
,-[files/index.js:6:1]
5 | // Another comment
6 | let y = 2;
6 | let y = /abc/gu;
: ^^^
7 |
`----

x tokens-plugin(tokens): Identifier ("y")
,-[files/index.js:6:5]
5 | // Another comment
6 | let y = 2;
6 | let y = /abc/gu;
: ^
7 |
`----

x tokens-plugin(tokens): Punctuator ("=")
,-[files/index.js:6:7]
5 | // Another comment
6 | let y = 2;
6 | let y = /abc/gu;
: ^
7 |
`----

x tokens-plugin(tokens): Numeric ("2")
x tokens-plugin(tokens): RegularExpression ("/abc/gu")
| regex: {"flags":"gu","pattern":"abc"}
,-[files/index.js:6:9]
5 | // Another comment
6 | let y = 2;
: ^
6 | let y = /abc/gu;
: ^^^^^^^
7 |
`----

x tokens-plugin(tokens): Punctuator (";")
,-[files/index.js:6:10]
,-[files/index.js:6:16]
5 | // Another comment
6 | let y = 2;
: ^
6 | let y = /abc/gu;
: ^
7 |
`----

Expand Down
14 changes: 10 additions & 4 deletions apps/oxlint/test/fixtures/tokens/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import assert from "node:assert";

import type { Plugin, Rule } from "#oxlint";

const STANDARD_TOKEN_KEYS = new Set(["type", "value", "start", "end", "range", "loc"]);

const rule: Rule = {
create(context) {
const { sourceCode } = context;
Expand Down Expand Up @@ -74,10 +76,14 @@ const rule: Rule = {

// Report each token / comment separately
for (const token of tokensAndComments) {
context.report({
message: `${token.type} (${JSON.stringify(token.value)})`,
node: token,
});
let message = `${token.type} (${JSON.stringify(token.value)})`;
for (const key of Object.keys(token) as (keyof typeof token)[]) {
if (!STANDARD_TOKEN_KEYS.has(key)) {
message += `\n ${key}: ${JSON.stringify(token[key])}`;
}
}

context.report({ message, node: token });
}

return {};
Expand Down
Loading