fix(codegen): swap mapping/indent order for top-level decls#22206
Merged
graphite-app[bot] merged 1 commit intoMay 7, 2026
Conversation
Member
Author
How to use the Graphite Merge QueueAdd either label to this PR to merge it via 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. |
Merging this PR will not alter performance
Comparing 
Footnotes
|
Dunqing
changed the title
Dunqing
force-pushed
the
fix/codegen-indent-before-mapping-for-decls
branch
from
f1a5ace to
a623ceb
Compare
3 tasks
Contributor
Merge activity
|
Independent of #22199 / #22200. Fixes a separate sourcemap-indent issue. Five `gen.rs` impls for top-level declarations were calling `add_source_mapping(self.span)` *before* `print_indent()`: - `Directive` - `ImportDeclaration` - `ExportNamedDeclaration` - `ExportAllDeclaration` - `ExportDefaultDeclaration` The mapping then anchored at the line's indent column (col 0) rather than at the actual keyword column. Sourcemap consumers querying the keyword's gen position would land on the leading whitespace. Every other indented statement in the codebase (`ExpressionStatement`, `IfStatement`, `VariableDeclaration`, etc.) uses the inverse order — `print_indent` first, then `add_source_mapping`. This PR brings the five outliers in line. ## Visual comparison The bug surfaces when codegen is invoked with non-zero `initial_indent` (a common pattern for bundler callers that nest output in a wrapper). [Before vs After this PR](https://source-map-viewer.void.app/compare?a=5KX8dYtn&b=ZFhNIEAv) on a fixture with all five declaration kinds: ```js "use strict"; import { x } from "x"; export { y } from "y"; export * from "z"; export default 42; ``` Each declaration's source position now maps to gen col 1 (the keyword) instead of gen col 0 (the leading tab). ## Test plan - [x] New test `top_level_decl_mappings_start_after_generated_indent` — wraps a `"use strict"`, `import`, three `export` forms inside an indented `if (true) { ... }` block, asserts each maps from `src col 0` to `gen col 1` (after the tab), not `gen col 0`. - [x] Verified the test fails without the fix. - [x] All 99 codegen tests pass.
graphite-app
Bot
force-pushed
the
fix/codegen-indent-before-mapping-for-decls
branch
from
a623ceb to
29a3cd7
Compare
graphite-app Bot
pushed a commit
that referenced
this pull request
May 7, 2026
) Stacked on #22206. Pure refactor — no behavior change. The `print_next_indent_as_space` flag was being read inline at **five** sites in `gen.rs` via copy-pasted `if flag { print_hard_space(); flag = false }` blocks. Two named private helpers replace those: - `consume_pending_indent_space() -> bool` — emit space + clear flag, returns whether anything was emitted - `clear_pending_indent_space()` — drop the flag without emitting `print_indent` continues to call `consume_pending_indent_space` internally, preserving the flag-as-space contract at every existing `print_indent` site. ## Test plan - [x] `cargo test -p oxc_codegen` passes (100 integration tests, no new tests added since the existing `top_level_decl_mappings_start_after_generated_indent` from #22206 already covers the `Directive` indent path) - [x] `cargo test -p oxc_isolated_declarations` passes (the namespace / `declare module` snapshot fixtures that already exercise indented import/export decls) - [x] No snapshot updates needed
camc314
added a commit
that referenced
this pull request
May 11, 2026
### 🚀 Features - 66c9b01 transformer/typescript: Debug_assert that `enum_eval` ran in semantic (#22252) (Dunqing) - ffe6475 minifier: Fold `Array` constructor with safe spreads (#22215) (camc314) ### 🐛 Bug Fixes - d3d0b18 traverse: Handle `ChainElement::TSNonNullExpression` in `GatherNodeParts` (#22247) (leaysgur) - 4e880de transformer/object-rest-spread: Declare temp vars for computed keys (#22284) (camc314) - a7c3e22 semantic: Clear member write target for computed keys (#22302) (camc314) - 6a8852d codegen: Emit newline after legal-comment orphan flush (#22304) (Dunqing) - 5da9fda transformer/explicit-resource-management: Preserve class names (#22306) (Dunqing) - b5d970f transformer/explicit-resource-management: Preserve class names (#22290) (camc314) - bc54fd4 minifier: Keep function / class names if direct eval is present in the scope (#22241) (sapphi-red) - 7a810c0 minifier: Refresh direct eval flags after DCE (#21787) (Dunqing) - dd88726 transformer/legacy-decorator: Preserve accessor type annotation for emitDecoratorMetadata (#21966) (Dunqing) - 29a3cd7 codegen: Swap mapping/indent order for top-level decls (#22206) (Dunqing) - 73b4f40 minifier: Preserve catch binding with direct eval (#22221) (camc314) - 0e13d17 minifier: Preserve optional chain base side effects (#22219) (camc314) - 0c7c01c transformer/typescript: Inline optional-chain enum member access (#21834) (Dunqing) - a6aff7e codegen: Emit block/array/object end mapping at close char (#22200) (Dunqing) - a099b03 codegen: Emit call end mapping at `)` position, not past it (#22199) (Dunqing) - 5753774 minifier: Cap if-return ternary collapse for firefox (#21841) (Gurupungav Narayanan) - 2493bdd codegen: Correct sourcemap end mappings for closing delimiters (#22001) (Mark Dalgleish) - 3b385e2 minifier: Bail optimizing `Array` with unknown arg count (#22188) (camc314) - 9fa2122 parser: Parse array computed class keys (#22159) (camc314) ### 📚 Documentation - a4a6892 napi/parser: Correct code comment (#22278) (overlookmotel) - 9305373 oxc: Update README (#22178) (camc314) Co-authored-by: Cameron <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Independent of #22199 / #22200. Fixes a separate sourcemap-indent issue.
Five
gen.rsimpls for top-level declarations were callingadd_source_mapping(self.span)beforeprint_indent():DirectiveImportDeclarationExportNamedDeclarationExportAllDeclarationExportDefaultDeclarationThe mapping then anchored at the line's indent column (col 0) rather than at the actual keyword column. Sourcemap consumers querying the keyword's gen position would land on the leading whitespace.
Every other indented statement in the codebase (
ExpressionStatement,IfStatement,VariableDeclaration, etc.) uses the inverse order —print_indentfirst, thenadd_source_mapping. This PR brings the five outliers in line.Visual comparison
The bug surfaces when codegen is invoked with non-zero
initial_indent(a common pattern for bundler callers that nest output in a wrapper). Before vs After this PR on a fixture with all five declaration kinds:Each declaration's source position now maps to gen col 1 (the keyword) instead of gen col 0 (the leading tab).
Test plan
top_level_decl_mappings_start_after_generated_indent— wraps a"use strict",import, threeexportforms inside an indentedif (true) { ... }block, asserts each maps fromsrc col 0togen col 1(after the tab), notgen col 0.