Skip to content

fix(linter/consistent-type-specifier-style): skip comments when searching for token #15732

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
Nov 15, 2025
Merged

fix(linter/consistent-type-specifier-style): skip comments when searching for token #15732

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
16 changes: 7 additions & 9 deletions crates/oxc_linter/src/rules/import/consistent_type_specifier_style.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ impl Rule for ConsistentTypeSpecifierStyle {
fn from_configuration(value: Value) -> Self {
Self { mode: value.get(0).and_then(Value::as_str).map(Mode::from).unwrap_or_default() }
}
#[expect(clippy::cast_possible_truncation)]
fn run<'a>(&self, node: &AstNode<'a>, ctx: &LintContext<'a>) {
let AstKind::ImportDeclaration(import_decl) = node.kind() else {
return;
Expand Down Expand Up @@ -152,14 +151,8 @@ impl Rule for ConsistentTypeSpecifierStyle {
rule_fixes.push(fixer.insert_text_before(item, "type "));
}
// find the 'type' keyword and remove it
if let Some(type_token_span) = ctx
.source_range(Span::new(import_decl.span.start, specifiers[0].span().start))
.find("type")
.map(|pos| {
let start = import_decl.span.start + pos as u32;
Span::sized(start, 4)
})
{
if let Some(pos) = ctx.find_next_token_from(import_decl.span.start, "type") {
let type_token_span = Span::sized(import_decl.span.start + pos, 4);
let remove_fix = fixer.delete_range(type_token_span);
rule_fixes.push(remove_fix);
}
Expand Down Expand Up @@ -323,6 +316,11 @@ fn test() {
"import { type foo, /** comments */ type bar } from 'foo'",
Some(json!(["prefer-inline"])),
),
(
"import /* type */ type { foo } from 'foo'",
"import /* type */ { type foo } from 'foo'",
Some(json!(["prefer-inline"])),
),
(
r"
import type {
Expand Down
Loading