diff --git a/package.json b/package.json index 21bb76046..a346b6831 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "escape-string-regexp": "1.0.5", "esutils": "2.0.2", "find-project-root": "1.1.1", - "flow-parser": "0.69", + "flow-parser": "0.70", "get-stream": "3.0.0", "globby": "6.1.0", "graphql": "0.13.2", diff --git a/tests/flow/traits/__snapshots__/jsfmt.spec.js.snap b/tests/flow/traits/__snapshots__/jsfmt.spec.js.snap index 1808e48e2..ccf8d2002 100644 --- a/tests/flow/traits/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/traits/__snapshots__/jsfmt.spec.js.snap @@ -22,7 +22,7 @@ declare class Baz { ((new Foo).y: string); // error: Bar wins ((new Foo).z: number); // error: Qux wins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -declare class Foo extends Qux { +declare class Foo extends Qux mixins Bar { // KeyedCollection <: Collection // ...KeyedIterable } @@ -51,6 +51,6 @@ declare interface I { } declare class C mixins I { } ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ declare interface I {} -declare class C {} +declare class C mixins I {} `; diff --git a/tests/flow_implements/__snapshots__/jsfmt.spec.js.snap b/tests/flow_implements/__snapshots__/jsfmt.spec.js.snap new file mode 100644 index 000000000..5c7ba9f8c --- /dev/null +++ b/tests/flow_implements/__snapshots__/jsfmt.spec.js.snap @@ -0,0 +1,16 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`implements.js 1`] = ` +class A implements B {} +class A implements B, C {} +declare class A implements B {} +declare class A mixins B implements C {} +declare class A implements B, C {} +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +class A implements B {} +class A implements B, C {} +declare class A implements B {} +declare class A implements C mixins B {} +declare class A implements B, C {} + +`; diff --git a/tests/flow_implements/implements.js b/tests/flow_implements/implements.js new file mode 100644 index 000000000..32acd7162 --- /dev/null +++ b/tests/flow_implements/implements.js @@ -0,0 +1,5 @@ +class A implements B {} +class A implements B, C {} +declare class A implements B {} +declare class A mixins B implements C {} +declare class A implements B, C {} diff --git a/tests/flow_implements/jsfmt.spec.js b/tests/flow_implements/jsfmt.spec.js new file mode 100644 index 000000000..b9a908981 --- /dev/null +++ b/tests/flow_implements/jsfmt.spec.js @@ -0,0 +1 @@ +run_spec(__dirname, ["flow"]); diff --git a/tests/flow_mixins/jsfmt.spec.js b/tests/flow_mixins/jsfmt.spec.js index 968651cdb..bffb7a547 100644 --- a/tests/flow_mixins/jsfmt.spec.js +++ b/tests/flow_mixins/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babylon", "flow"]); diff --git a/yarn.lock b/yarn.lock index c41b7e419..b0c3e3a69 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1971,9 +1971,9 @@ flatten@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" -flow-parser@0.69: - version "0.69.0" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.69.0.tgz#378b5128d6d0b554a8b2f16a4ca3e1ab9649f00e" +flow-parser@0.70: + version "0.70.0" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.70.0.tgz#9c310187efe4380ba9a251284e9b83b95c49e857" for-in@^1.0.1: version "1.0.2"