Skip to content

fix(formatter): preserve import phases#22692

Merged
leaysgur merged 3 commits into
mainfrom
codex/fix-oxfmt-import-phase
May 25, 2026
Merged

fix(formatter): preserve import phases#22692
leaysgur merged 3 commits into
mainfrom
codex/fix-oxfmt-import-phase

Conversation

@camc314

@camc314 camc314 commented May 24, 2026

Copy link
Copy Markdown
Contributor

Preserve import phases when formatting import declarations.

oxfmt was dropping defer and source from phase imports because the formatter did not print ImportDeclaration.phase. This adds phase printing after import and covers import defer plus import source cases in formatter fixtures.

fixes #22691

@github-actions github-actions Bot added the A-formatter Area - Formatter label May 24, 2026
@camc314 camc314 marked this pull request as ready for review May 24, 2026 11:41
@camc314 camc314 requested review from Dunqing and leaysgur as code owners May 24, 2026 11:41
Copilot AI review requested due to automatic review settings May 24, 2026 11:41

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR fixes the TypeScript formatter to preserve import phases (source / defer) when printing ImportDeclarations, and adds a regression fixture for the reported case.

Changes:

  • Print ImportDeclaration.phase (source / defer) between import (and optional type) and the import clause.
  • Add a new TS fixture covering mixed phase imports plus a non-import statement between them.
  • Add the corresponding snapshot to ensure formatting output remains stable.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
crates/oxc_formatter/src/print/import_declaration.rs Adds printing of ImportDeclaration.phase() so import source ... / import defer ... is preserved in formatted output.
crates/oxc_formatter/tests/fixtures/ts/import-phases/issue-22691.ts New regression fixture input exercising source/defer phase imports (including with { ... }).
crates/oxc_formatter/tests/fixtures/ts/import-phases/issue-22691.ts.snap Snapshot confirming the formatter output preserves import phases across print widths.

@codspeed-hq

codspeed-hq Bot commented May 24, 2026

Copy link
Copy Markdown

Merging this PR will not alter performance

✅ 52 untouched benchmarks
⏩ 8 skipped benchmarks1


Comparing codex/fix-oxfmt-import-phase (cce5f93) with main (26b9396)2

Open in CodSpeed

Footnotes

  1. 8 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports.

  2. No successful run was found on main (779e769) during the generation of this report, so 26b9396 was used instead as the comparison base. There might be some changes unrelated to this pull request in this report.

@leaysgur leaysgur added the 0-merge Merge with Graphite Merge Queue label May 25, 2026
@leaysgur leaysgur merged commit 5a26479 into main May 25, 2026
36 checks passed
@leaysgur leaysgur deleted the codex/fix-oxfmt-import-phase branch May 25, 2026 01:22
graphite-app Bot pushed a commit that referenced this pull request May 25, 2026
Dunqing added a commit that referenced this pull request May 26, 2026
# Oxlint
### 🚀 Features

- 10da26b linter: `no-misleading-character-class` add suggestions for
regex literal (#22681) (Sysix)
- b84941e linter/vue: Implement no-expose-after-await rule (#22675)
(bab)
- 98b98c1 linter/vue: Implement no-computed-properties-in-data rule
(#22674) (bab)
- 868e2e8 linter: Add suggestion for `no-misleading-character-class`
(#22631) (Sysix)
- 2d4c919 oxlint: Support `vite-plus/resolveConfig` for vite.config.ts
(#22456) (leaysgur)
- 2a60012 linter/vue: Implement require-render-return rule (#22613)
(bab)
- 9f227fd linter/vue: Implement no-deprecated-props-default-this rule
(#21892) (bab)
- 9cd28b3 linter: Add debug option to print files to be linted (#22546)
(camchenry)
- 87f065e linter/vue: Implement return-in-emits-validator rule (#21935)
(bab)
- ea0380c linter/unicorn: Implement `import-style` rule (#22173) (Hao
Chen)
- dde40fe linter/vue: Implement no-watch-after-await rule (#22006) (bab)
- a735eb0 linter/vue: Implement valid-next-tick rule (#22531) (bab)
- 6dc615d linter/vue: Implement no-shared-component-data rule (#21842)
(bab)
- a656418 linter/vue: Implement valid-define-options rule (#22107) (bab)
- bb6f1b2 linter/vue: Implement require-slots-as-functions rule (#22244)
(bab)
- 5fa4774 linter/n: Implement `callback-return` rule (#22470) (Mikhail
Baev)

### 🐛 Bug Fixes

- 52bd016 linter: Respect allow unused disable directives in LSP
(#22715) (camc314)
- fa7c463 semantic: Correct TS enum member symbol spans (#22689)
(camc314)
- ed445ba linter: Respect flags overrides for `RegExp(/regex/i, "u")`
(#22678) (Sysix)
- 26b9396 semantic: Resolve parameter decorators outside parameter scope
(#22623) (camc314)
- 203952d linter: `no-misleading-character-class` fix
`is_unicode_code_point_escape` check (#22655) (Sysix)
- 2f64d3d linter: `no-misleading-character-class` own diagnostic for
surrogate pairs without u flag (#22654) (Sysix)
- 0c6ebc2 linter/eslint/no-lone-blocks: Do not flag empty loops (#22649)
(Mikhail Baev)
- 2a7562e linter/no-focused-tests: Mark fixer as a suggestion (#22645)
(camc314)
- dbe644f linter: Respect args none for unused rest parameters (#22627)
(camc314)
- d0211b0 linter: Allow undefined in DummyRuleMap index (#22626)
(camc314)
- 36fc0ec oxlint/lsp: "ignore this" actions merge with existing
directive (#22604) (Sysix)
- f7f370e linter/vitest/prefer-expect-type-of: Recommend `toBeTypeOf`
instead of `expectTypeOf` (#22612) (Mikhail Baev)
- 77063e5 linter/consistent-indexed-object-style: Preserve interface
modifiers in fixes (#22579) (camc314)
- 4f33aa7 linter: Treat `TSGlobalDeclaration` as ambient in
`has_ambient_typescript_ancestor` (#22577) (camc314)

### ⚡ Performance

- c22938d linter/no-async-endpoint-handlers: Populate node types
(#22601) (camc314)
- 607486e linter/no-negated-condition: Populate node types (#22602)
(camc314)
- 4dcaa59 linter/consistent-type-imports: Populate node types (#22600)
(camc314)
- 5bd3b25 linter/no-unused-vars: Avoid cloned ancestor iterator (#22598)
(camc314)
- 97fe9ba linter/no-extra-non-null-assertion: Reduce node matches
(#22588) (camc314)
- ae98296 linter/consistent-indexed-object-style: Populate node types
(#22578) (camc314)
# Oxfmt
### 🚀 Features

- 16b8058 oxfmt: Support `vite-plus/resolveConfig` for vite.config.ts
(#22454) (leaysgur)

### 🐛 Bug Fixes

- 5a26479 formatter: Preserve import phases (#22692) (Cameron)

### ⚡ Performance

- 78cf83f formatter: Pre-size output buffer using source text length
(#22594) (Dunqing)

Co-authored-by: Dunqing <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0-merge Merge with Graphite Merge Queue A-formatter Area - Formatter

Projects

None yet

Development

Successfully merging this pull request may close these issues.

oxfmt: import defer changes to import

4 participants