Skip to content

fix(formatter): keep comments inside surviving parens and suppressed statement terminators#24253

Merged
graphite-app[bot] merged 1 commit into
mainfrom
07-07-fix_formatter_keep_comments_inside_surviving_parens_and_suppressed_statement_terminators
Jul 7, 2026
Merged

fix(formatter): keep comments inside surviving parens and suppressed statement terminators#24253
graphite-app[bot] merged 1 commit into
mainfrom
07-07-fix_formatter_keep_comments_inside_surviving_parens_and_suppressed_statement_terminators

Conversation

@leaysgur

@leaysgur leaysgur commented Jul 7, 2026

Copy link
Copy Markdown
Member

Fix regression found in this series of PRs.

leaysgur commented Jul 7, 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.

@oxc-guard

oxc-guard Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

Oxfmt Ecosystem CI

suite oxfmt@latest main refs/pull/24253/head branch
actualbudget/actual
eggjs/egg
monkeytypegame/monkeytype
AmanVarshney01/create-better-t-stack
cnpm/cnpmcore
fastify/fastify-vite
formatjs/formatjs
fuma-nama/fumadocs
cloudflare/workers-sdk
lichess-org/lila
aidenybai/react-grab
mantinedev/mantine
tale/headplane
mastodon/mastodon
huggingface/huggingface.js
cloudflare/agents
rolldown/rolldown
npmx-dev/npmx.dev
Comfy-Org/ComfyUI_frontend ⚠️
dyad-sh/dyad
getsentry/sentry-javascript
vuejs/core
vercel/turborepo
vuejs/pinia
openclaw/openclaw

💥 = panic, ⚠️ = error e.g. parse error (main/branch columns: only new errors), ❌ = diff or exit code mismatch, 🟨 = differs from oxfmt@latest (merged-but-unreleased changes)

@codspeed-hq

codspeed-hq Bot commented Jul 7, 2026

Copy link
Copy Markdown

Merging this PR will not alter performance

✅ 52 untouched benchmarks
⏩ 19 skipped benchmarks1


Comparing 07-07-fix_formatter_keep_comments_inside_surviving_parens_and_suppressed_statement_terminators (9b69ec0) with main (1343779)

Open in CodSpeed

Footnotes

  1. 19 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 commented Jul 7, 2026

Copy link
Copy Markdown
Member Author

NOTE: All diffs are not related to this PR.

@leaysgur leaysgur force-pushed the 07-07-fix_formatter_keep_comments_inside_surviving_parens_and_suppressed_statement_terminators branch from 126bb13 to 0304d63 Compare July 7, 2026 08:51
@leaysgur leaysgur added the 0-merge Merge with Graphite Merge Queue label Jul 7, 2026

leaysgur commented Jul 7, 2026

Copy link
Copy Markdown
Member Author

Merge activity

  • Jul 7, 8:51 AM UTC: The merge label '0-merge' was detected. This PR will be added to the Graphite merge queue once it meets the requirements.
  • Jul 7, 8:56 AM UTC: leaysgur added this pull request to the Graphite merge queue.
  • Jul 7, 9:03 AM UTC: The Graphite merge queue couldn't merge this PR because it had merge conflicts.
  • Jul 7, 9:04 AM UTC: The merge label '0-merge' was detected. This PR will be added to the Graphite merge queue once it meets the requirements.
  • Jul 7, 9:08 AM UTC: leaysgur added this pull request to the Graphite merge queue.
  • Jul 7, 9:14 AM UTC: Merged by the Graphite merge queue.

@graphite-app graphite-app Bot changed the base branch from 07-07-fix_formatter_keep_comment_inline_for_empty_statements to graphite-base/24253 July 7, 2026 08:54
@graphite-app graphite-app Bot removed the 0-merge Merge with Graphite Merge Queue label Jul 7, 2026
@graphite-app graphite-app Bot changed the base branch from graphite-base/24253 to main July 7, 2026 09:01
@leaysgur leaysgur force-pushed the 07-07-fix_formatter_keep_comments_inside_surviving_parens_and_suppressed_statement_terminators branch from 0304d63 to 9b69ec0 Compare July 7, 2026 09:04
@leaysgur leaysgur added the 0-merge Merge with Graphite Merge Queue label Jul 7, 2026
…statement terminators (#24253)

Fix regression found in this series of PRs.
@graphite-app graphite-app Bot force-pushed the 07-07-fix_formatter_keep_comments_inside_surviving_parens_and_suppressed_statement_terminators branch from 9b69ec0 to 42ec8de Compare July 7, 2026 09:09
@graphite-app graphite-app Bot merged commit 42ec8de into main Jul 7, 2026
29 checks passed
@graphite-app graphite-app Bot removed the 0-merge Merge with Graphite Merge Queue label Jul 7, 2026
@graphite-app graphite-app Bot deleted the 07-07-fix_formatter_keep_comments_inside_surviving_parens_and_suppressed_statement_terminators branch July 7, 2026 09:14
Boshen added a commit that referenced this pull request Jul 14, 2026
# Oxlint
### 🚀 Features

- 0433a83 linter/eslint/no-inner-declarations: Add `namespaces` option
(#24044) (Boshen)
- 92f154a oxlint,oxfmt: Auto-discover `.mts` config files (#24357)
(camc314)
- 8c1d74b linter/import/no-duplicates: Add autofix logic (#24273) (Cole
Ellison)

### 🐛 Bug Fixes

- 0b086de linter/jest/prefer-lowercase-title: False positive when
`lowercaseFirstCharacterOnly` is false (#24414) (Connor Shea)
- 097cb95 linter: Allow `vite-plus/test` and `@effect as Vitest source
(#24196) (Liang)
- 8337835 linter: Error on `ignorePatterns` that cannot match files
aoutside the config directory (#24341) (leaysgur)
- 9ba30e5 linter/oxc/bad-replace-all-arg: Add note to enhance diagnostic
(#24346) (camc314)
- 2ce5a33 linter: Resolve `ignorePatterns` relative to the config dir
(#24339) (leaysgur)
- ab90eed linter/eslint/no-loop-func: Do not error on catch variables
(#24316) (Chris Opperwall)
- b67f0a6 linter/eslint/no-unused-vars: Count default parameter updates
as usage (#24323) (camc314)
- d193f8e linter: Detect Junie agent env vars (#24277) (Jeevan Mohan
Pawar)
- 2aecf60 linter/eslint/no-unreachable: Handle `break` in switch stmts
correctly (#24260) (camc314)

### ⚡ Performance

- 7f80cac linter/vue/prop-name-casing: Precompile `ignoreProps` regex
pattern (#24413) (connorshea)
- 6272051 linter/typescript/no-require-imports: Compile allow patterns
once (#24417) (connorshea)
- fb1edf1 linter: Compute comment fix span only for directive comments
(#24419) (connorshea)
- 33805b9 linter/jsdoc/require-param: Compile checkTypesPattern regex
once (#24420) (connorshea)
- 8de6fca linter/jest/valid-title: Compile disallowedWords regex once
(#24412) (Connor Shea)
- 4a0d8dc linter/eslint/no-underscore-dangle: Avoid String clone per
identifier (#24371) (Ian Macalinao)
- f3ab04c linter/typescript/consistent-type-imports: Remove redundant
Vec per violation (#24370) (Ian Macalinao)
- 4d2d78d linter/typescript/prefer-ts-expect-error: Avoid String clone
per comment (#24369) (Ian Macalinao)
# Oxfmt
### 🚀 Features

- 3a7fe74 formatter_css: Update oxc-css-parser to 0.0.7 (#24434)
(leaysgur)
- 0173cd3 formatter_css: Format Less :extend and merge props (#24358)
(leaysgur)
- 92f154a oxlint,oxfmt: Auto-discover `.mts` config files (#24357)
(camc314)
- df250df formatter: Support `quoteProps` for TS enum and methods
(#24309) (leaysgur)
- a9a5cd6 formatter_core: Expose `SourceText::as_str()` (#24281)
(leaysgur)

### 🐛 Bug Fixes

- 162bddf formatter: Add required parens for conditional type in type
parameter constraint (#24450) (leaysgur)
- 2d22a91 formatter: Determine type cast target from span instead of
lexical scan (#24447) (leaysgur)
- 25306e9 formatter: Do not add extra parens with type cast comment
(#24444) (leaysgur)
- bd6edfe formatter: Break arrow signature that exactly fills the line
when cond body may hug (#24440) (leaysgur)
- a99ef41 formatter: Keep quotes on method signature named new (#24432)
(leaysgur)
- fcc28df formatter_css: Keep glued-braket-value tight (#24352)
(leaysgur)
- 8337835 linter: Error on `ignorePatterns` that cannot match files
aoutside the config directory (#24341) (leaysgur)
- b7c7e15 formatter: Add parens for import and private field in new
callee chain (#24320) (leaysgur)
- 0c8f6e4 formatter: Update detect_code_removal for #24309 (#24314)
(leaysgur)
- a85aad0 formatter: Fix member-chain and non-null parens (#24312)
(leaysgur)
- 1c29c73 formatter: Preserve `TSNonNullExpression` in chain expression
(#24311) (leaysgur)
- 8933c0e formatter: Keep comment inside of empty `switch` block
(#24308) (leaysgur)
- ec26af2 formatter: Preserve blank lines between JSX attrs (#24290)
(leaysgur)
- 70bd54d formatter: Keep arrow function body comment (#24287)
(leaysgur)
- 415fe1e oxfmt: Error on ignorePatterns that cannot match files outside
the config directory (#24286) (leaysgur)
- eeabc4a formatter_css: Bail on EOF-recovered parse errors (#24282)
(leaysgur)
- 42ec8de formatter: Keep comments inside surviving parens and
suppressed statement terminators (#24253) (leaysgur)
- 1343779 formatter: Keep comment inline for empty statements (#24249)
(leaysgur)
- b996579 formatter: Print ; before trailing comments part 2 (#24246)
(leaysgur)
- 4f86e8c formatter: Print `;` before trailing comments (#24244)
(leaysgur)
- 01252e4 formatter: Add or remove parens for `let` declaration (#24215)
(leaysgur)

### ⚡ Performance

- eeb1913 formatter_core: Avoid per-call `Vec` work-stack in soft-line
removal (#23775) (Marius Schulz)
- a2f255b formatter: Use `SmallVec` for `MemberChain` collections
(#23776) (Marius Schulz)

### 📚 Documentation

- b52d0f5 formatter: Add TODO comment about unsound code (#24372)
(overlookmotel)

Co-authored-by: Boshen <1430279+Boshen@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-ast-tools Area - AST tools A-formatter Area - Formatter

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant