diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-concat-block-scoped/actual.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/block-scoped-for/actual.js similarity index 51% rename from packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-concat-block-scoped/actual.js rename to packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/block-scoped-for/actual.js index bdd6bb03c..bf9dd73e8 100644 --- a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-concat-block-scoped/actual.js +++ b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/block-scoped-for/actual.js @@ -1,2 +1,5 @@ let i = 0; for (let x = 0; x < 10; x++) console.log(i + x); + +const j = 0; +for (const x = 0; ; ) console.log(j + x); diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-concat-block-scoped/expected.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/block-scoped-for/expected.js similarity index 53% rename from packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-concat-block-scoped/expected.js rename to packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/block-scoped-for/expected.js index bdd6bb03c..86890ac6b 100644 --- a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-concat-block-scoped/expected.js +++ b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/block-scoped-for/expected.js @@ -1,2 +1,5 @@ let i = 0; for (let x = 0; x < 10; x++) console.log(i + x); + +const j = 0; +for (const x = 0;;) console.log(j + x); \ No newline at end of file diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/concat-block-scoped-outside/actual.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/block-scoped-outside-for/actual.js similarity index 100% rename from packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/concat-block-scoped-outside/actual.js rename to packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/block-scoped-outside-for/actual.js diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/block-scoped-outside-for/expected.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/block-scoped-outside-for/expected.js new file mode 100644 index 000000000..47c4619fc --- /dev/null +++ b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/block-scoped-outside-for/expected.js @@ -0,0 +1,4 @@ +let i = 0, + y = 0; + +for (let x = 0; x < 10; x++) console.log(i + x); \ No newline at end of file diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/concat-block-scoped-outside/expected.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/concat-block-scoped-outside/expected.js deleted file mode 100644 index 222ff33a7..000000000 --- a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/concat-block-scoped-outside/expected.js +++ /dev/null @@ -1,4 +0,0 @@ -let i = 0, - y = 0; - -for (let x = 0; x < 10; x++) console.log(i + x); diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/concat-var-for-loop/expected.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/concat-var-for-loop/expected.js index 703768c48..ba12d4ebf 100644 --- a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/concat-var-for-loop/expected.js +++ b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/concat-var-for-loop/expected.js @@ -1 +1,2 @@ -for (var i = 0, j = 0, x = 0; x < 10; x++) console.log(i + x); + +for (var i = 0, j = 0, x = 0; x < 10; x++) console.log(i + x); \ No newline at end of file diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/concat-var/expected.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/concat-var/expected.js index c2131b51c..fd5512d0b 100644 --- a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/concat-var/expected.js +++ b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/concat-var/expected.js @@ -1,3 +1,3 @@ var i = 0, - x = 0, - y = 0; + x = 0, + y = 0; \ No newline at end of file diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-destructing/actual.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-destructuring-var/actual.js similarity index 100% rename from packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-destructing/actual.js rename to packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-destructuring-var/actual.js diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-destructing/expected.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-destructuring-var/expected.js similarity index 98% rename from packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-destructing/expected.js rename to packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-destructuring-var/expected.js index 04ed0f006..fd02755a4 100644 --- a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-destructing/expected.js +++ b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-destructuring-var/expected.js @@ -3,4 +3,4 @@ for (var i = 0; i < 0; i++) { } for (var i = 0; i < 0; i++) { var { j } = jj(); -} +} \ No newline at end of file diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-diff-type/actual.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-different-declars/actual.js similarity index 100% rename from packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-diff-type/actual.js rename to packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-different-declars/actual.js diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-diff-type/expected.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-different-declars/expected.js similarity index 95% rename from packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-diff-type/expected.js rename to packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-different-declars/expected.js index 55fd5e85f..8899a99fd 100644 --- a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-diff-type/expected.js +++ b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-different-declars/expected.js @@ -1,3 +1,3 @@ for (let i = 0; i < 0; i++) { var i = 0; -} +} \ No newline at end of file diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-let-declars/expected.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-let-declars/expected.js index 1dea34eee..eb1378967 100644 --- a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-let-declars/expected.js +++ b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-let-declars/expected.js @@ -1,3 +1,3 @@ for (let i = 0, j; i < 0; i++) { j = jj(); -} +} \ No newline at end of file diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-mult-declars/actual.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-mult-declars/actual.js similarity index 100% rename from packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-mult-declars/actual.js rename to packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-mult-declars/actual.js diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-mult-declars/expected.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-mult-declars/expected.js similarity index 75% rename from packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-mult-declars/expected.js rename to packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-mult-declars/expected.js index f7ba000fa..2b134a306 100644 --- a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-mult-declars/expected.js +++ b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-mult-declars/expected.js @@ -1,4 +1,4 @@ for (var i = 0; i < 0; i++) { var i = 0, - k = 0; -} + k = 0; +} \ No newline at end of file diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-no-loop/expected.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-no-loop-intializer/actual.js similarity index 100% rename from packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-no-loop/expected.js rename to packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-no-loop-intializer/actual.js diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-no-loop-intializer/expected.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-no-loop-intializer/expected.js new file mode 100644 index 000000000..127ace573 --- /dev/null +++ b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-no-loop-intializer/expected.js @@ -0,0 +1,2 @@ +for (;;) {} +for (;;) var i = 0; \ No newline at end of file diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-not-initialized/expected.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-not-initialized/actual.js similarity index 100% rename from packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-not-initialized/expected.js rename to packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-not-initialized/actual.js diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-not-initialized/expected.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-not-initialized/expected.js new file mode 100644 index 000000000..62fa1a4c6 --- /dev/null +++ b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-not-initialized/expected.js @@ -0,0 +1,3 @@ +for (var i = 0;;) { + var i; +} \ No newline at end of file diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-var-declars/expected.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-var-declars/expected.js index e45eb0a32..a5b9bc324 100644 --- a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-var-declars/expected.js +++ b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/lift-var-declars/expected.js @@ -1,4 +1,4 @@ for (var i = 0, j; i < 0; i++) { j = jj(); } -for (var i = 0, j; ; ) j = 0; +for (var i = 0, j;;) j = 0; \ No newline at end of file diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-concat-const-for-loop/actual.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-concat-const-for-loop/actual.js deleted file mode 100644 index f77104f56..000000000 --- a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-concat-const-for-loop/actual.js +++ /dev/null @@ -1,2 +0,0 @@ -const j = 0; -for (const x = 0; ; ) console.log(j + x); diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-concat-const-for-loop/expected.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-concat-const-for-loop/expected.js deleted file mode 100644 index f77104f56..000000000 --- a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-concat-const-for-loop/expected.js +++ /dev/null @@ -1,2 +0,0 @@ -const j = 0; -for (const x = 0; ; ) console.log(j + x); diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-no-loop/actual.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-no-loop/actual.js deleted file mode 100644 index 04ed0f006..000000000 --- a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-no-loop/actual.js +++ /dev/null @@ -1,6 +0,0 @@ -for (var i = 0; i < 0; i++) { - var [j] = jj(); -} -for (var i = 0; i < 0; i++) { - var { j } = jj(); -} diff --git a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-not-initialized/actual.js b/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-not-initialized/actual.js deleted file mode 100644 index 55fd5e85f..000000000 --- a/packages/babel-plugin-transform-merge-sibling-variables/__tests__/fixtures/not-lift-on-not-initialized/actual.js +++ /dev/null @@ -1,3 +0,0 @@ -for (let i = 0; i < 0; i++) { - var i = 0; -}