Skip to content

fix: additional semicolon in TSInterfaceBody #868

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
merged 1 commit into from
Apr 27, 2022
Merged

fix: additional semicolon in TSInterfaceBody #868

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
5 changes: 2 additions & 3 deletions lib/printer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2424,12 +2424,11 @@ function genericPrintNoParens(path: any, options: any, print: any) {
]);

case "TSInterfaceBody": {
const lines = fromString(";\n").join(path.map(print, "body"));
const lines = fromString("\n").join(path.map(print, "body"));
if (lines.isEmpty()) {
return fromString("{}", options);
}

return concat(["{\n", lines.indent(options.tabWidth), ";", "\n}"]);
return concat(["{\n", lines.indent(options.tabWidth), "\n}"]);
}

case "TSImportType":
Expand Down
92 changes: 77 additions & 15 deletions test/typescript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,23 +213,23 @@ const nodeMajorVersion = parseInt(process.versions.node, 10);

check([
"interface LabelledContainer<T> {",
" label: string;",
" content: T;",
" option?: boolean;",
" readonly x: number;",
" [index: number]: string;",
" [propName: string]: any;",
" readonly [index: number]: string;",
" (source: string, subString: string): boolean;",
" (start: number): string;",
" reset(): void;",
" a(c: (this: void, e: E) => void): void;",
" label: string",
" content: T",
" option?: boolean",
" readonly x: number",
" [index: number]: string",
" [propName: string]: any",
" readonly [index: number]: string",
" (source: string, subString: string): boolean",
" (start: number): string",
" reset(): void",
" a(c: (this: void, e: E) => void): void",
"}",
]);

check([
"interface Square<T, U> extends Shape<T, U>, Visible<T, U> {",
" sideLength: number;",
" sideLength: number",
"}",
]);

Expand Down Expand Up @@ -257,17 +257,17 @@ const nodeMajorVersion = parseInt(process.versions.node, 10);
"}",
]);

check(["export interface S {", " i(s: string): boolean;", "}"]);
check(["export interface S {", " i(s: string): boolean", "}"]);

check([
"namespace Validation {",
" export interface S {",
" i(j: string): boolean;",
" i(j: string): boolean",
" }",
"}",
]);

check(["export interface S {", " i(j: string): boolean;", "}"]);
check(["export interface S {", " i(j: string): boolean", "}"]);

check(["declare namespace D3 {", " export const f: number = 2;", "}"]);

Expand Down Expand Up @@ -307,6 +307,68 @@ const nodeMajorVersion = parseInt(process.versions.node, 10);
"type Alpha = Color.a;",
]);
});

it("InterfaceBody: duplicate semicolon", function () {
const code = [
"interface Hello {",
" 'hello': any;",
" 'hello': string;",
"}",
].join(eol);

const ast = recast.parse(code, { parser });

ast.program.body[0].body.body.pop();

assert.strictEqual(
recast.print(ast).code,
[
"interface Hello {",
" 'hello': any;",
"}",
].join(eol),
);
});

it("InterfaceBody: duplicate semicolon: a lot of properties", function () {
const code = [
"interface LabelledContainer<T> {",
" label: string;",
" content: T;",
" option?: boolean;",
" readonly x: number;",
" [index: number]: string;",
" [propName: string]: any;",
" readonly [index: number]: string;",
" (source: string, subString: string): boolean;",
" (start: number): string;",
" reset(): void;",
" a(c: (this: void, e: E) => void): void;",
"}",
].join(eol);

const ast = recast.parse(code, { parser });

ast.program.body[0].body.body.shift();

assert.strictEqual(
recast.print(ast).code,
[
"interface LabelledContainer<T> {",
" content: T;",
" option?: boolean;",
" readonly x: number;",
" [index: number]: string;",
" [propName: string]: any;",
" readonly [index: number]: string;",
" (source: string, subString: string): boolean;",
" (start: number): string;",
" reset(): void;",
" a(c: (this: void, e: E) => void): void;",
"}",
].join(eol),
);
});
});

testReprinting(
Expand Down