Skip to content

fix(isolated-declarations): lost leading comments of export default function/class/interface #10990

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
May 13, 2025
Merged

fix(isolated-declarations): lost leading comments of export default function/class/interface #10990

Show file tree
Hide file tree
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
24 changes: 23 additions & 1 deletion crates/oxc_isolated_declarations/src/module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,30 @@ impl<'a> IsolatedDeclarations<'a> {
declaration.map(|(var_decl, declaration)| {
let exported =
ModuleExportName::IdentifierName(self.ast.identifier_name(SPAN, "default"));
// When `var_decl` is Some, the comments are moved to the variable declaration, otherwise
// keep the comments on the export default declaration to avoid losing them.
// ```ts
// // comment
// export default function(): void {}
//
// // comment
// export default 1;
// ```
//
// to
//
// ```ts
// // comment
// export default function(): void;
//
// // comment
// const _default = 1;
// export default _default;
// ```

let span = if var_decl.is_some() { SPAN } else { decl.span };
let declaration =
self.ast.module_declaration_export_default_declaration(SPAN, exported, declaration);
self.ast.module_declaration_export_default_declaration(span, exported, declaration);
(var_decl, Statement::from(declaration))
})
}
Expand Down
6 changes: 3 additions & 3 deletions crates/oxc_isolated_declarations/tests/fixtures/export-default.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const defaultDelimitersClose = new Uint8Array([125, 125])
const defaultDelimitersClose = new Uint8Array([125, 125]);

/** comment should be a leading comment of the class */
export default class Tokenizer {
public delimiterClose: Uint8Array = defaultDelimitersClose
public delimiterClose: Uint8Array = defaultDelimitersClose;
}

1 change: 1 addition & 0 deletions crates/oxc_isolated_declarations/tests/snapshots/export-default.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ input_file: crates/oxc_isolated_declarations/tests/fixtures/export-default.ts
```
==================== .D.TS ====================

/** comment should be a leading comment of the class */
export default class Tokenizer {
delimiterClose: Uint8Array;
}
Loading