Skip to content

Handle comments in export declarations between type and type name. #19565

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
fisker merged 7 commits into from
Jul 7, 2026
Merged

Handle comments in export declarations between type and type name. #19565

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
017fd72
Fix comment loss for shorthand export specifiers with type modifier
kirkwaiblinger Jul 7, 2026
147afc3
Fix same comment-loss bug for shorthand import specifiers
kirkwaiblinger Jul 7, 2026
53a6dcb
detailed tests
kirkwaiblinger Jul 7, 2026
b34e468
clean up
kirkwaiblinger Jul 7, 2026
1b4269d
test snapshots
kirkwaiblinger Jul 7, 2026
f1310c1
changelog
kirkwaiblinger Jul 7, 2026
8cc0d68
reword
kirkwaiblinger Jul 7, 2026
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
Prev Previous commit
Next Next commit
test snapshots
  • Loading branch information
@kirkwaiblinger
kirkwaiblinger committed Jul 7, 2026
commit 1b4269d2c1b9f69705daa73e99dce52668f5d3d4
32 changes: 20 additions & 12 deletions tests/format/typescript/import-export/__snapshots__/format.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,6 @@ export type { B as C } from './a';
export type { foo } from 'bar';
export type { foo };

export { /* e1 */ type /* e2 */ T /* e3 */ } from 'foo';
import { /* i1 */ type /* i2 */ T /* i3 */ } from 'foo';

export { /* e1 */ type /* e2 */ T /* e3 */ as /* e4 */ U /* e5 */ } from 'foo';
import { /* i1 */ type /* i2 */ T /* i3 */ as /* i4 */ U /* i5 */ } from 'foo';

// this should be treated as a normal import statement
import type from './foo';

Expand All @@ -122,19 +116,23 @@ import type { foo as bar } from 'baz';
import type * as foo from './bar';
import type foo from 'bar';

// https://github.com/prettier/prettier/issues/19564
export { type /* comment */ T } from 'foo';
import { type /* comment */ T } from 'foo';

export { /* e1 */ type /* e2 */ T /* e3 */ } from 'foo';
import { /* i1 */ type /* i2 */ T /* i3 */ } from 'foo';

export { /* e1 */ type /* e2 */ T /* e3 */ as /* e4 */ U /* e5 */ } from 'foo';
import { /* i1 */ type /* i2 */ T /* i3 */ as /* i4 */ U /* i5 */ } from 'foo';

=====================================output=====================================
export type { SomeThing };
export type { A as B };
export type { B as C } from "./a";
export type { foo } from "bar";
export type { foo };

export { /* e1 */ type /* e2 */ T /* e3 */ } from "foo";
import { /* i1 */ type /* i2 */ T /* i3 */ } from "foo";

export { /* e1 */ type /* e2 */ T /* e3 */ as /* e4 */ U /* e5 */ } from "foo";
import { /* i1 */ type /* i2 */ T /* i3 */ as /* i4 */ U /* i5 */ } from "foo";

// this should be treated as a normal import statement
import type from "./foo";

Expand All @@ -144,5 +142,15 @@ import type { foo as bar } from "baz";
import type * as foo from "./bar";
import type foo from "bar";

// https://github.com/prettier/prettier/issues/19564
export { type /* comment */ T } from "foo";
import { type /* comment */ T } from "foo";

export { /* e1 */ type /* e2 */ T /* e3 */ } from "foo";
import { /* i1 */ type /* i2 */ T /* i3 */ } from "foo";

export { /* e1 */ type /* e2 */ T /* e3 */ as /* e4 */ U /* e5 */ } from "foo";
import { /* i1 */ type /* i2 */ T /* i3 */ as /* i4 */ U /* i5 */ } from "foo";

================================================================================
`;
Loading