From 58ec149c522c9b9c7933befbb120e54d3de0c5e0 Mon Sep 17 00:00:00 2001 From: Brian Ng Date: Tue, 27 Jun 2017 22:15:10 -0500 Subject: [PATCH] Fix some unneeded semis in test fixtures (#5892) --- .../misc/regression-2765/actual.js | 2 +- .../misc/regression-2765/expected.js | 2 -- .../fixtures/flow/call-properties/actual.js | 2 +- .../fixtures/flow/call-properties/expected.js | 3 +-- .../fixtures/flow/def-site-variance/actual.js | 20 ++++++++-------- .../flow/def-site-variance/expected.js | 14 +---------- .../interfaces-module-and-script/actual.js | 10 ++++---- .../interfaces-module-and-script/expected.js | 5 ---- .../fixtures/flow/type-annotations/actual.js | 4 ++-- .../flow/type-annotations/expected.js | 4 +--- .../fixtures/flow/type-parameters/actual.js | 24 +++++++++---------- .../fixtures/flow/type-parameters/expected.js | 18 +------------- 12 files changed, 35 insertions(+), 73 deletions(-) diff --git a/packages/babel-core/test/fixtures/transformation/misc/regression-2765/actual.js b/packages/babel-core/test/fixtures/transformation/misc/regression-2765/actual.js index 926823c6b6..ff69908c4e 100644 --- a/packages/babel-core/test/fixtures/transformation/misc/regression-2765/actual.js +++ b/packages/babel-core/test/fixtures/transformation/misc/regression-2765/actual.js @@ -2,7 +2,7 @@ function f() { let g = async () => { this; }; -}; +} class Class { async m() { diff --git a/packages/babel-core/test/fixtures/transformation/misc/regression-2765/expected.js b/packages/babel-core/test/fixtures/transformation/misc/regression-2765/expected.js index 7e51ff2f5c..fa2a70a09b 100644 --- a/packages/babel-core/test/fixtures/transformation/misc/regression-2765/expected.js +++ b/packages/babel-core/test/fixtures/transformation/misc/regression-2765/expected.js @@ -12,8 +12,6 @@ function f() { }(); } -; - class Class { m() { var _this2 = this; diff --git a/packages/babel-generator/test/fixtures/flow/call-properties/actual.js b/packages/babel-generator/test/fixtures/flow/call-properties/actual.js index 62f0a1b259..204e5f9ae5 100644 --- a/packages/babel-generator/test/fixtures/flow/call-properties/actual.js +++ b/packages/babel-generator/test/fixtures/flow/call-properties/actual.js @@ -2,4 +2,4 @@ var a: { (): number }; var a: { (): number; }; var a: { (): number; y: string; (x: string): string }; var a: { (x: T): number; }; -interface A { (): number; }; +interface A { (): number; } diff --git a/packages/babel-generator/test/fixtures/flow/call-properties/expected.js b/packages/babel-generator/test/fixtures/flow/call-properties/expected.js index 5f9a0e7f55..53a7f9633a 100644 --- a/packages/babel-generator/test/fixtures/flow/call-properties/expected.js +++ b/packages/babel-generator/test/fixtures/flow/call-properties/expected.js @@ -14,5 +14,4 @@ var a: { }; interface A { (): number -} -; +} \ No newline at end of file diff --git a/packages/babel-generator/test/fixtures/flow/def-site-variance/actual.js b/packages/babel-generator/test/fixtures/flow/def-site-variance/actual.js index a9cf25b9c2..5cda68f8e9 100644 --- a/packages/babel-generator/test/fixtures/flow/def-site-variance/actual.js +++ b/packages/babel-generator/test/fixtures/flow/def-site-variance/actual.js @@ -5,13 +5,13 @@ type T = { +p: T }; type T = { -p: T }; type T = { +[k:K]: V }; type T = { -[k:K]: V }; -interface I { +p: T }; -interface I { -p: T }; -interface I { +[k:K]: V }; -interface I { -[k:K]: V }; -declare class I { +p: T }; -declare class I { -p: T }; -declare class I { +[k:K]: V }; -declare class I { -[k:K]: V }; -class C2 { +p: T = e }; -class C3 { -p: T = e }; +interface I { +p: T } +interface I { -p: T } +interface I { +[k:K]: V } +interface I { -[k:K]: V } +declare class I { +p: T } +declare class I { -p: T } +declare class I { +[k:K]: V } +declare class I { -[k:K]: V } +class C2 { +p: T = e } +class C3 { -p: T = e } diff --git a/packages/babel-generator/test/fixtures/flow/def-site-variance/expected.js b/packages/babel-generator/test/fixtures/flow/def-site-variance/expected.js index f2edae6bbb..e411f46461 100644 --- a/packages/babel-generator/test/fixtures/flow/def-site-variance/expected.js +++ b/packages/babel-generator/test/fixtures/flow/def-site-variance/expected.js @@ -18,44 +18,32 @@ type T = { interface I { +p: T } -; interface I { -p: T } -; interface I { +[k: K]: V } -; interface I { -[k: K]: V } -; declare class I { +p: T } -; declare class I { -p: T } -; declare class I { +[k: K]: V } -; declare class I { -[k: K]: V } -; class C2 { +p: T = e; } -; - class C3 { -p: T = e; -} - -; +} \ No newline at end of file diff --git a/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/actual.js b/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/actual.js index f55148215c..85decdae35 100644 --- a/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/actual.js +++ b/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/actual.js @@ -1,8 +1,8 @@ -interface A {}; -interface A extends B {}; -interface A extends B, C {}; -interface A { foo: () => number; }; -interface Dictionary { [index: string]: string; length: number; }; +interface A {} +interface A extends B {} +interface A extends B, C {} +interface A { foo: () => number; } +interface Dictionary { [index: string]: string; length: number; } class Foo implements Bar {} class Foo extends Bar implements Bat, Man {} class Foo extends class Bar implements Bat {} {} diff --git a/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/expected.js b/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/expected.js index ef0f742254..f6f4341fdd 100644 --- a/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/expected.js +++ b/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/expected.js @@ -1,18 +1,13 @@ interface A {} -; interface A extends B {} -; interface A extends B, C {} -; interface A { foo: () => number } -; interface Dictionary { length: number, [index: string]: string, } -; class Foo implements Bar {} diff --git a/packages/babel-generator/test/fixtures/flow/type-annotations/actual.js b/packages/babel-generator/test/fixtures/flow/type-annotations/actual.js index f13c027117..a1f7ce71d5 100644 --- a/packages/babel-generator/test/fixtures/flow/type-annotations/actual.js +++ b/packages/babel-generator/test/fixtures/flow/type-annotations/actual.js @@ -105,8 +105,8 @@ import { type Foo as Bar } from "bar"; import { typeof Foo as Bar } from "bar"; export type { foo }; export type { bar } from "bar"; -export interface baz { p: number }; -export interface qux { p: T }; +export interface baz { p: number } +export interface qux { p: T } var a: ?Array; var a: {| numVal: number |}; var a: {| numVal: number; |}; diff --git a/packages/babel-generator/test/fixtures/flow/type-annotations/expected.js b/packages/babel-generator/test/fixtures/flow/type-annotations/expected.js index 86a227593c..1e8c30dd10 100644 --- a/packages/babel-generator/test/fixtures/flow/type-annotations/expected.js +++ b/packages/babel-generator/test/fixtures/flow/type-annotations/expected.js @@ -231,11 +231,9 @@ export type { bar } from "bar"; export interface baz { p: number } -; export interface qux { p: T } -; var a: ?Array; var a: {| numVal: number @@ -288,4 +286,4 @@ var a: {| function foo(numVal: number = 2) {} -function foo(numVal?: number = 2) {} +function foo(numVal?: number = 2) {} \ No newline at end of file diff --git a/packages/babel-generator/test/fixtures/flow/type-parameters/actual.js b/packages/babel-generator/test/fixtures/flow/type-parameters/actual.js index 8c307485e8..a995d06499 100644 --- a/packages/babel-generator/test/fixtures/flow/type-parameters/actual.js +++ b/packages/babel-generator/test/fixtures/flow/type-parameters/actual.js @@ -3,19 +3,19 @@ type A = T; type A = T; type A = T; type A = T; -class A {}; -class A {}; -class A {}; -class A {}; +class A {} +class A {} +class A {} +class A {} (class A {}); (class A {}); (class A {}); (class A {}); -declare class A {}; -declare class A {}; -declare class A {}; -declare class A {}; -interface A {}; -interface A {}; -interface A {}; -interface A {}; +declare class A {} +declare class A {} +declare class A {} +declare class A {} +interface A {} +interface A {} +interface A {} +interface A {} diff --git a/packages/babel-generator/test/fixtures/flow/type-parameters/expected.js b/packages/babel-generator/test/fixtures/flow/type-parameters/expected.js index 5a44fe1a30..f447788449 100644 --- a/packages/babel-generator/test/fixtures/flow/type-parameters/expected.js +++ b/packages/babel-generator/test/fixtures/flow/type-parameters/expected.js @@ -6,20 +6,12 @@ type A = T; class A {} -; - class A {} -; - class A {} -; - class A {} -; - (class A {}); (class A {}); @@ -29,18 +21,10 @@ class A {} (class A {}); declare class A {} -; declare class A {} -; declare class A {} -; declare class A {} -; interface A {} -; interface A {} -; interface A {} -; -interface A {} -; \ No newline at end of file +interface A {} \ No newline at end of file