Skip to content

fix(formatter/sort_imports): Use label to classify lines#22512

Merged
graphite-app[bot] merged 1 commit into
mainfrom
05-18-fix_formatter_sort_imports_use_label_to_classify_lines
May 18, 2026
Merged

fix(formatter/sort_imports): Use label to classify lines#22512
graphite-app[bot] merged 1 commit into
mainfrom
05-18-fix_formatter_sort_imports_use_label_to_classify_lines

Conversation

@leaysgur

@leaysgur leaysgur commented May 18, 2026

Copy link
Copy Markdown
Member

Fixes #22486

Two complementary fixes for the panic in source_line.rs:139 (ImportDeclaration must have a source):

  1. Track inside_line_suffix in the line-flush loop so an internal Line(_) emitted by a trailing comment's line_suffix(...) no longer splits the import line into an orphan fragment.
  2. Classify lines by the presence of JsLabels::ImportDeclaration instead of a textual prefix check on element text. The textual check was fragile against formatted JSDoc, which splits a single comment into a mix of Token/Text elements.

@github-actions github-actions Bot added the A-formatter Area - Formatter label May 18, 2026

leaysgur commented May 18, 2026

Copy link
Copy Markdown
Member Author

How to use the Graphite Merge Queue

Add either label to this PR to merge it via the merge queue:

  • 0-merge - adds this PR to the back of the merge queue
  • hotfix - for urgent changes, fast-track this PR to the front of the merge queue

You must have a Graphite account in order to use the merge queue. Sign up using this link.

An organization admin has enabled the Graphite Merge Queue in this repository.

Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.

This stack of pull requests is managed by Graphite. Learn more about stacking.

@codspeed-hq

codspeed-hq Bot commented May 18, 2026

Copy link
Copy Markdown

Merging this PR will not alter performance

✅ 44 untouched benchmarks
⏩ 7 skipped benchmarks1


Comparing 05-18-fix_formatter_sort_imports_use_label_to_classify_lines (1e587b0) with main (ce92c6c)

Open in CodSpeed

Footnotes

  1. 7 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.

@leaysgur leaysgur marked this pull request as ready for review May 18, 2026 00:59
@leaysgur leaysgur requested a review from Dunqing as a code owner May 18, 2026 00:59
@graphite-app graphite-app Bot added the 0-merge Merge with Graphite Merge Queue label May 18, 2026
@graphite-app

graphite-app Bot commented May 18, 2026

Copy link
Copy Markdown
Contributor

Merge activity

Fixes #22486

Two complementary fixes for the panic in `source_line.rs:139` (`ImportDeclaration` must have a source):

1. Track `inside_line_suffix` in the line-flush loop so an internal `Line(_)` emitted by a trailing comment's `line_suffix(...)` no longer splits the import line into an orphan fragment.
2. Classify lines by the presence of `JsLabels::ImportDeclaration` instead of a textual prefix check on element text. The textual check was fragile against formatted JSDoc, which splits a single comment into a mix of `Token`/`Text` elements.
@graphite-app graphite-app Bot force-pushed the 05-18-fix_formatter_sort_imports_use_label_to_classify_lines branch from 1e587b0 to 8ee946f Compare May 18, 2026 01:08
@graphite-app graphite-app Bot merged commit 8ee946f into main May 18, 2026
28 checks passed
@graphite-app graphite-app Bot removed the 0-merge Merge with Graphite Merge Queue label May 18, 2026
@graphite-app graphite-app Bot deleted the 05-18-fix_formatter_sort_imports_use_label_to_classify_lines branch May 18, 2026 01:13
camc314 pushed a commit that referenced this pull request May 18, 2026
# Oxlint
### 🚀 Features

- 1ae291e linter/no-underscore-dangle: Add `allowInUsingDeclarations`
option (#22483) (吴杨帆)
- 0440b0f linter/eslint: Implement `id-match` rule (#22379) (Vladislav
Sayapin)
- 65bf119 linter: Implement react no-object-type-as-default-prop
(#22481) (uhyo)
- 2a6ddce linter/eslint: Implement `no-implied-eval` rule (#22391)
(Vladislav Sayapin)
- d3a3c1d linter: Auto detect agents from CLI and transition to the
agent output format (#22068) (Jovi De Croock)
- 625758a linter/vitest: Implement padding-around-after-all-blocks rule
(#21788) (kapobajza)
- 37680b0 linter: Implement react no-unstable-nested-components (#22248)
(Jovi De Croock)
- d8d9c74 linter: Implement import/newline-after-import rule (#19142)
(Ryuya Yanagi)

### 🐛 Bug Fixes

- 3f59e03 linter: Only call rayon/miette/tracing inits once (#21899)
(Matiss Janis Aboltins)
- 602dfd6 linter/promise/no-return-wrap: Detect Promise calls in all
branches (#22474) (zennnnnnn11)
- e182aee linter: Allow dialogs and popovers for no_autofocus (#22289)
(mehm8128)
- 7ffb710 linter/jest/vitest: Jest/no-standalone-expect ignores
additionalTestBlockFunctions option for jest/vitest hooks (#22477)
(kapobajza)
- c6f2d3f linter: Add more expression support for iframe-has-title
(#22460) (mehm8128)
- 5747ff1 linter: Avoid enabling jest with vitest plugin (#22499)
(camc314)
- 863984f linter/no-find-dom-node: Run on all files (#22479) (bab)

### ⚡ Performance

- 2afef79 linter: Optimize `no-loop-func` (#22491) (camchenry)
- 4c9ca72 oxlint: Align walker thread count with rayon pool (#22494)
(Boshen)

### 📚 Documentation

- f7967c7 linter/id-match: Clarify `onlyDeclarations` config docs
(#22523) (camc314)
- 1e0c97f linter: Fix closing code block in documentation for
`padding-around-after-all-blocks` rule. (#22513) (connorshea)
- a9049fd linter: Exclude directly provide autoFocus to dialog pattern
(#22510) (mehm8128)
# Oxfmt
### 🐛 Bug Fixes

- 8ee946f formatter/sort_imports: Use label to classify lines (#22512)
(leaysgur)
- 8c1da44 formatter: Normalize destructuring keys in DCR (#22478)
(camc314)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-formatter Area - Formatter

Projects

None yet

Development

Successfully merging this pull request may close these issues.

formatter: leading JSDoc block before grouped imports panics ("ImportDeclaration must have a source")

1 participant