From a1002df11662e01497408bbeb739a87b2e7eff88 Mon Sep 17 00:00:00 2001 From: "Christopher J. Brody" Date: Mon, 28 Jun 2021 11:20:49 -0400 Subject: [PATCH] prettierx test: move & reorganize some prettierX tests into a better-organized tests/format/x subdirectory tree move some TypeScript-specific test subdirectories under tests/format/x/typescript rename some test subdirectories should help avoid lint issues with updates from upstream Prettier based on some updates proposed in: - https://github.com/brodybits/prettierx/pull/603 NEXT STEP: move prettierX-specific test variations into tests/format/x subdirectory tree Co-authored-by: Adaline Valentina Simonian Co-authored-by: Christopher J. Brody --- .../__snapshots__/jsfmt.spec.js.snap | 0 .../inside-computed-member-expression.ng | 0 .../inside-member-expression.ng | 0 .../inside-optional-expression.ng | 0 .../interpolation-additional-pipe-expressions}/inside-unary.ng | 0 .../interpolation-additional-pipe-expressions}/jsfmt.spec.js | 0 .../with-inner-spacing/__snapshots__/jsfmt.spec.js.snap | 0 .../with-inner-spacing/jsfmt.spec.js | 0 .../x/html}/html-void-tags/__snapshots__/jsfmt.spec.js.snap | 0 tests/{ => format/x/html}/html-void-tags/input.html | 0 tests/{ => format/x/html}/html-void-tags/jsfmt.spec.js | 0 .../js/align-object-properties}/__snapshots__/jsfmt.spec.js.snap | 0 .../es => format/x/js/align-object-properties}/jsfmt.spec.js | 0 .../es => format/x/js/align-object-properties}/o.js | 0 .../with-inner-spacing/__snapshots__/jsfmt.spec.js.snap | 0 .../js/align-object-properties}/with-inner-spacing/jsfmt.spec.js | 0 .../js}/break-long-method-chains/__snapshots__/jsfmt.spec.js.snap | 0 tests/{ => format/x/js}/break-long-method-chains/jsfmt.spec.js | 0 .../x/js}/break-long-method-chains/long-method-chain-test1.js | 0 .../x/js}/generator-star-spacing/__snapshots__/jsfmt.spec.js.snap | 0 tests/{ => format/x/js}/generator-star-spacing/correct.js | 0 tests/{ => format/x/js}/generator-star-spacing/incorrect.js | 0 tests/{ => format/x/js}/generator-star-spacing/jsfmt.spec.js | 0 .../x/js/import-formatting}/__snapshots__/jsfmt.spec.js.snap | 0 .../x/js/import-formatting}/jsfmt.spec.js | 0 .../x/js/import-formatting}/long_import.js | 0 .../x/js}/inner-paren-spacing/__snapshots__/jsfmt.spec.js.snap | 0 tests/{ => format/x/js}/inner-paren-spacing/arrays.js | 0 tests/{ => format/x/js}/inner-paren-spacing/bind.js | 0 tests/{ => format/x/js}/inner-paren-spacing/class.js | 0 tests/{ => format/x/js}/inner-paren-spacing/conditionals.js | 0 tests/{ => format/x/js}/inner-paren-spacing/destructuring.js | 0 tests/{ => format/x/js}/inner-paren-spacing/expressions.js | 0 tests/{ => format/x/js}/inner-paren-spacing/functions.js | 0 .../x/js}/inner-paren-spacing/html-template-literals.js | 0 tests/{ => format/x/js}/inner-paren-spacing/import-export.js | 0 tests/{ => format/x/js}/inner-paren-spacing/jest-test-each.js | 0 tests/{ => format/x/js}/inner-paren-spacing/jsfmt.spec.js | 0 tests/{ => format/x/js}/inner-paren-spacing/loops.js | 0 tests/{ => format/x/js}/inner-paren-spacing/nullish.js | 0 tests/{ => format/x/js}/inner-paren-spacing/objects.js | 0 tests/{ => format/x/js}/inner-paren-spacing/return.js | 0 tests/{ => format/x/js}/inner-paren-spacing/sequence.js | 0 tests/{ => format/x/js}/inner-paren-spacing/spread.js | 0 tests/{ => format/x/js}/inner-paren-spacing/switch.js | 0 tests/{ => format/x/js}/inner-paren-spacing/template-literals.js | 0 tests/{ => format/x/js}/inner-paren-spacing/ternaries.js | 0 tests/{ => format/x/js}/inner-paren-spacing/throw.js | 0 tests/{ => format/x/js}/inner-paren-spacing/try-catch.js | 0 tests/{ => format/x/js}/inner-paren-spacing/with.js | 0 .../x/js}/no-indent-chains/__snapshots__/jsfmt.spec.js.snap | 0 tests/{ => format/x/js}/no-indent-chains/jsfmt.spec.js | 0 tests/{ => format/x/js}/no-indent-chains/member-chain.js | 0 .../with-inner-spacing/__snapshots__/jsfmt.spec.js.snap | 0 .../x/js}/no-indent-chains/with-inner-spacing/jsfmt.spec.js | 0 .../__snapshots__/jsfmt.spec.js.snap | 0 .../x/js/no-semi-additional-member-expressions}/jsfmt.spec.js | 0 .../no-semi-additional-member-expressions}/member-expressions.js | 0 .../__snapshots__/jsfmt.spec.js.snap | 0 .../x/js/space-before-function-paren-eslint}/eslint.js | 0 .../x/js/space-before-function-paren-eslint}/jsfmt.spec.js | 0 tests/{ => format/x/js}/standard/__snapshots__/jsfmt.spec.js.snap | 0 tests/{ => format/x/js}/standard/correct-ternaries.js | 0 tests/{ => format/x/js}/standard/correct.js | 0 .../x/js/standard/flow-types}/__snapshots__/jsfmt.spec.js.snap | 0 .../{standard/flow => format/x/js/standard/flow-types}/correct.js | 0 .../flow => format/x/js/standard/flow-types}/incorrect.js | 0 .../flow => format/x/js/standard/flow-types}/jsfmt.spec.js | 0 tests/{ => format/x/js}/standard/incorrect-ternaries.js | 0 tests/{ => format/x/js}/standard/incorrect.js | 0 tests/{ => format/x/js}/standard/jsfmt.spec.js | 0 .../ternary-object-expressions/__snapshots__/jsfmt.spec.js.snap | 0 tests/{ => format/x/js}/ternary-object-expressions/crewdress.js | 0 tests/{ => format/x/js}/ternary-object-expressions/jsfmt.spec.js | 0 .../x/js}/ternary-object-expressions/nested-ternary-promises.js | 0 .../nesting-object-ternary-expression.js | 0 .../x/js}/ternary-object-expressions/nesting-ternary-arrays.js | 0 .../with-balanced-formatting/__snapshots__/jsfmt.spec.js.snap | 0 .../with-balanced-formatting/jsfmt.spec.js | 0 .../x/js}/yield-star-spacing/__snapshots__/jsfmt.spec.js.snap | 0 tests/{ => format/x/js}/yield-star-spacing/correct.js | 0 tests/{ => format/x/js}/yield-star-spacing/incorrect.js | 0 tests/{ => format/x/js}/yield-star-spacing/jsfmt.spec.js | 0 .../generic-function-expression}/__snapshots__/jsfmt.spec.js.snap | 0 .../generic-function-expression}/function-expression.ts | 0 .../x/typescript/generic-function-expression}/jsfmt.spec.js | 0 .../__snapshots__/jsfmt.spec.js.snap | 0 .../typescript/space-before-function-paren-tslint}/jsfmt.spec.js | 0 .../x/typescript/space-before-function-paren-tslint}/tsbaz.ts | 0 .../with-inner-spacing/__snapshots__/jsfmt.spec.js.snap | 0 .../with-inner-spacing/jsfmt.spec.js | 0 .../x/typescript/ts-standard}/__snapshots__/jsfmt.spec.js.snap | 0 .../typescript => format/x/typescript/ts-standard}/correct.ts | 0 .../typescript => format/x/typescript/ts-standard}/incorrect.ts | 0 .../typescript => format/x/typescript/ts-standard}/jsfmt.spec.js | 0 .../with-inner-spacing/__snapshots__/jsfmt.spec.js.snap | 0 .../x/typescript/ts-standard}/with-inner-spacing/jsfmt.spec.js | 0 97 files changed, 0 insertions(+), 0 deletions(-) rename tests/{angular_interpolation/additional-pipe-expressions => format/x/angular/interpolation-additional-pipe-expressions}/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{angular_interpolation/additional-pipe-expressions => format/x/angular/interpolation-additional-pipe-expressions}/inside-computed-member-expression.ng (100%) rename tests/{angular_interpolation/additional-pipe-expressions => format/x/angular/interpolation-additional-pipe-expressions}/inside-member-expression.ng (100%) rename tests/{angular_interpolation/additional-pipe-expressions => format/x/angular/interpolation-additional-pipe-expressions}/inside-optional-expression.ng (100%) rename tests/{angular_interpolation/additional-pipe-expressions => format/x/angular/interpolation-additional-pipe-expressions}/inside-unary.ng (100%) rename tests/{angular_interpolation/additional-pipe-expressions => format/x/angular/interpolation-additional-pipe-expressions}/jsfmt.spec.js (100%) rename tests/{angular_interpolation/additional-pipe-expressions => format/x/angular/interpolation-additional-pipe-expressions}/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{angular_interpolation/additional-pipe-expressions => format/x/angular/interpolation-additional-pipe-expressions}/with-inner-spacing/jsfmt.spec.js (100%) rename tests/{ => format/x/html}/html-void-tags/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{ => format/x/html}/html-void-tags/input.html (100%) rename tests/{ => format/x/html}/html-void-tags/jsfmt.spec.js (100%) rename tests/{align-object-properties/es => format/x/js/align-object-properties}/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{align-object-properties/es => format/x/js/align-object-properties}/jsfmt.spec.js (100%) rename tests/{align-object-properties/es => format/x/js/align-object-properties}/o.js (100%) rename tests/{align-object-properties/es => format/x/js/align-object-properties}/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{align-object-properties/es => format/x/js/align-object-properties}/with-inner-spacing/jsfmt.spec.js (100%) rename tests/{ => format/x/js}/break-long-method-chains/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{ => format/x/js}/break-long-method-chains/jsfmt.spec.js (100%) rename tests/{ => format/x/js}/break-long-method-chains/long-method-chain-test1.js (100%) rename tests/{ => format/x/js}/generator-star-spacing/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{ => format/x/js}/generator-star-spacing/correct.js (100%) rename tests/{ => format/x/js}/generator-star-spacing/incorrect.js (100%) rename tests/{ => format/x/js}/generator-star-spacing/jsfmt.spec.js (100%) rename tests/{import_formatting => format/x/js/import-formatting}/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{import_formatting => format/x/js/import-formatting}/jsfmt.spec.js (100%) rename tests/{import_formatting => format/x/js/import-formatting}/long_import.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{ => format/x/js}/inner-paren-spacing/arrays.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/bind.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/class.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/conditionals.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/destructuring.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/expressions.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/functions.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/html-template-literals.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/import-export.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/jest-test-each.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/jsfmt.spec.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/loops.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/nullish.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/objects.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/return.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/sequence.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/spread.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/switch.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/template-literals.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/ternaries.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/throw.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/try-catch.js (100%) rename tests/{ => format/x/js}/inner-paren-spacing/with.js (100%) rename tests/{ => format/x/js}/no-indent-chains/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{ => format/x/js}/no-indent-chains/jsfmt.spec.js (100%) rename tests/{ => format/x/js}/no-indent-chains/member-chain.js (100%) rename tests/{ => format/x/js}/no-indent-chains/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{ => format/x/js}/no-indent-chains/with-inner-spacing/jsfmt.spec.js (100%) rename tests/{no-semi/additional-member-expressions => format/x/js/no-semi-additional-member-expressions}/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{no-semi/additional-member-expressions => format/x/js/no-semi-additional-member-expressions}/jsfmt.spec.js (100%) rename tests/{no-semi/additional-member-expressions => format/x/js/no-semi-additional-member-expressions}/member-expressions.js (100%) rename tests/{space-before-function-paren/eslint-compat => format/x/js/space-before-function-paren-eslint}/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{space-before-function-paren/eslint-compat => format/x/js/space-before-function-paren-eslint}/eslint.js (100%) rename tests/{space-before-function-paren/eslint-compat => format/x/js/space-before-function-paren-eslint}/jsfmt.spec.js (100%) rename tests/{ => format/x/js}/standard/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{ => format/x/js}/standard/correct-ternaries.js (100%) rename tests/{ => format/x/js}/standard/correct.js (100%) rename tests/{standard/flow => format/x/js/standard/flow-types}/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{standard/flow => format/x/js/standard/flow-types}/correct.js (100%) rename tests/{standard/flow => format/x/js/standard/flow-types}/incorrect.js (100%) rename tests/{standard/flow => format/x/js/standard/flow-types}/jsfmt.spec.js (100%) rename tests/{ => format/x/js}/standard/incorrect-ternaries.js (100%) rename tests/{ => format/x/js}/standard/incorrect.js (100%) rename tests/{ => format/x/js}/standard/jsfmt.spec.js (100%) rename tests/{ => format/x/js}/ternary-object-expressions/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{ => format/x/js}/ternary-object-expressions/crewdress.js (100%) rename tests/{ => format/x/js}/ternary-object-expressions/jsfmt.spec.js (100%) rename tests/{ => format/x/js}/ternary-object-expressions/nested-ternary-promises.js (100%) rename tests/{ => format/x/js}/ternary-object-expressions/nesting-object-ternary-expression.js (100%) rename tests/{ => format/x/js}/ternary-object-expressions/nesting-ternary-arrays.js (100%) rename tests/{ => format/x/js}/ternary-object-expressions/with-balanced-formatting/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{ => format/x/js}/ternary-object-expressions/with-balanced-formatting/jsfmt.spec.js (100%) rename tests/{ => format/x/js}/yield-star-spacing/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{ => format/x/js}/yield-star-spacing/correct.js (100%) rename tests/{ => format/x/js}/yield-star-spacing/incorrect.js (100%) rename tests/{ => format/x/js}/yield-star-spacing/jsfmt.spec.js (100%) rename tests/{typescript_generic/function-expression => format/x/typescript/generic-function-expression}/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{typescript_generic/function-expression => format/x/typescript/generic-function-expression}/function-expression.ts (100%) rename tests/{typescript_generic/function-expression => format/x/typescript/generic-function-expression}/jsfmt.spec.js (100%) rename tests/{space-before-function-paren/tslint-compat => format/x/typescript/space-before-function-paren-tslint}/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{space-before-function-paren/tslint-compat => format/x/typescript/space-before-function-paren-tslint}/jsfmt.spec.js (100%) rename tests/{space-before-function-paren/tslint-compat => format/x/typescript/space-before-function-paren-tslint}/tsbaz.ts (100%) rename tests/{space-before-function-paren/tslint-compat => format/x/typescript/space-before-function-paren-tslint}/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{space-before-function-paren/tslint-compat => format/x/typescript/space-before-function-paren-tslint}/with-inner-spacing/jsfmt.spec.js (100%) rename tests/{standard/typescript => format/x/typescript/ts-standard}/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{standard/typescript => format/x/typescript/ts-standard}/correct.ts (100%) rename tests/{standard/typescript => format/x/typescript/ts-standard}/incorrect.ts (100%) rename tests/{standard/typescript => format/x/typescript/ts-standard}/jsfmt.spec.js (100%) rename tests/{standard/typescript => format/x/typescript/ts-standard}/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/{standard/typescript => format/x/typescript/ts-standard}/with-inner-spacing/jsfmt.spec.js (100%) diff --git a/tests/angular_interpolation/additional-pipe-expressions/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/angular/interpolation-additional-pipe-expressions/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/angular_interpolation/additional-pipe-expressions/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/angular/interpolation-additional-pipe-expressions/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/angular_interpolation/additional-pipe-expressions/inside-computed-member-expression.ng b/tests/format/x/angular/interpolation-additional-pipe-expressions/inside-computed-member-expression.ng similarity index 100% rename from tests/angular_interpolation/additional-pipe-expressions/inside-computed-member-expression.ng rename to tests/format/x/angular/interpolation-additional-pipe-expressions/inside-computed-member-expression.ng diff --git a/tests/angular_interpolation/additional-pipe-expressions/inside-member-expression.ng b/tests/format/x/angular/interpolation-additional-pipe-expressions/inside-member-expression.ng similarity index 100% rename from tests/angular_interpolation/additional-pipe-expressions/inside-member-expression.ng rename to tests/format/x/angular/interpolation-additional-pipe-expressions/inside-member-expression.ng diff --git a/tests/angular_interpolation/additional-pipe-expressions/inside-optional-expression.ng b/tests/format/x/angular/interpolation-additional-pipe-expressions/inside-optional-expression.ng similarity index 100% rename from tests/angular_interpolation/additional-pipe-expressions/inside-optional-expression.ng rename to tests/format/x/angular/interpolation-additional-pipe-expressions/inside-optional-expression.ng diff --git a/tests/angular_interpolation/additional-pipe-expressions/inside-unary.ng b/tests/format/x/angular/interpolation-additional-pipe-expressions/inside-unary.ng similarity index 100% rename from tests/angular_interpolation/additional-pipe-expressions/inside-unary.ng rename to tests/format/x/angular/interpolation-additional-pipe-expressions/inside-unary.ng diff --git a/tests/angular_interpolation/additional-pipe-expressions/jsfmt.spec.js b/tests/format/x/angular/interpolation-additional-pipe-expressions/jsfmt.spec.js similarity index 100% rename from tests/angular_interpolation/additional-pipe-expressions/jsfmt.spec.js rename to tests/format/x/angular/interpolation-additional-pipe-expressions/jsfmt.spec.js diff --git a/tests/angular_interpolation/additional-pipe-expressions/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/angular/interpolation-additional-pipe-expressions/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/angular_interpolation/additional-pipe-expressions/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/angular/interpolation-additional-pipe-expressions/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/angular_interpolation/additional-pipe-expressions/with-inner-spacing/jsfmt.spec.js b/tests/format/x/angular/interpolation-additional-pipe-expressions/with-inner-spacing/jsfmt.spec.js similarity index 100% rename from tests/angular_interpolation/additional-pipe-expressions/with-inner-spacing/jsfmt.spec.js rename to tests/format/x/angular/interpolation-additional-pipe-expressions/with-inner-spacing/jsfmt.spec.js diff --git a/tests/html-void-tags/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/html/html-void-tags/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/html-void-tags/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/html/html-void-tags/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/html-void-tags/input.html b/tests/format/x/html/html-void-tags/input.html similarity index 100% rename from tests/html-void-tags/input.html rename to tests/format/x/html/html-void-tags/input.html diff --git a/tests/html-void-tags/jsfmt.spec.js b/tests/format/x/html/html-void-tags/jsfmt.spec.js similarity index 100% rename from tests/html-void-tags/jsfmt.spec.js rename to tests/format/x/html/html-void-tags/jsfmt.spec.js diff --git a/tests/align-object-properties/es/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/js/align-object-properties/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/align-object-properties/es/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/js/align-object-properties/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/align-object-properties/es/jsfmt.spec.js b/tests/format/x/js/align-object-properties/jsfmt.spec.js similarity index 100% rename from tests/align-object-properties/es/jsfmt.spec.js rename to tests/format/x/js/align-object-properties/jsfmt.spec.js diff --git a/tests/align-object-properties/es/o.js b/tests/format/x/js/align-object-properties/o.js similarity index 100% rename from tests/align-object-properties/es/o.js rename to tests/format/x/js/align-object-properties/o.js diff --git a/tests/align-object-properties/es/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/js/align-object-properties/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/align-object-properties/es/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/js/align-object-properties/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/align-object-properties/es/with-inner-spacing/jsfmt.spec.js b/tests/format/x/js/align-object-properties/with-inner-spacing/jsfmt.spec.js similarity index 100% rename from tests/align-object-properties/es/with-inner-spacing/jsfmt.spec.js rename to tests/format/x/js/align-object-properties/with-inner-spacing/jsfmt.spec.js diff --git a/tests/break-long-method-chains/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/js/break-long-method-chains/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/break-long-method-chains/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/js/break-long-method-chains/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/break-long-method-chains/jsfmt.spec.js b/tests/format/x/js/break-long-method-chains/jsfmt.spec.js similarity index 100% rename from tests/break-long-method-chains/jsfmt.spec.js rename to tests/format/x/js/break-long-method-chains/jsfmt.spec.js diff --git a/tests/break-long-method-chains/long-method-chain-test1.js b/tests/format/x/js/break-long-method-chains/long-method-chain-test1.js similarity index 100% rename from tests/break-long-method-chains/long-method-chain-test1.js rename to tests/format/x/js/break-long-method-chains/long-method-chain-test1.js diff --git a/tests/generator-star-spacing/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/js/generator-star-spacing/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/generator-star-spacing/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/js/generator-star-spacing/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/generator-star-spacing/correct.js b/tests/format/x/js/generator-star-spacing/correct.js similarity index 100% rename from tests/generator-star-spacing/correct.js rename to tests/format/x/js/generator-star-spacing/correct.js diff --git a/tests/generator-star-spacing/incorrect.js b/tests/format/x/js/generator-star-spacing/incorrect.js similarity index 100% rename from tests/generator-star-spacing/incorrect.js rename to tests/format/x/js/generator-star-spacing/incorrect.js diff --git a/tests/generator-star-spacing/jsfmt.spec.js b/tests/format/x/js/generator-star-spacing/jsfmt.spec.js similarity index 100% rename from tests/generator-star-spacing/jsfmt.spec.js rename to tests/format/x/js/generator-star-spacing/jsfmt.spec.js diff --git a/tests/import_formatting/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/js/import-formatting/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/import_formatting/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/js/import-formatting/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/import_formatting/jsfmt.spec.js b/tests/format/x/js/import-formatting/jsfmt.spec.js similarity index 100% rename from tests/import_formatting/jsfmt.spec.js rename to tests/format/x/js/import-formatting/jsfmt.spec.js diff --git a/tests/import_formatting/long_import.js b/tests/format/x/js/import-formatting/long_import.js similarity index 100% rename from tests/import_formatting/long_import.js rename to tests/format/x/js/import-formatting/long_import.js diff --git a/tests/inner-paren-spacing/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/js/inner-paren-spacing/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/inner-paren-spacing/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/js/inner-paren-spacing/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/inner-paren-spacing/arrays.js b/tests/format/x/js/inner-paren-spacing/arrays.js similarity index 100% rename from tests/inner-paren-spacing/arrays.js rename to tests/format/x/js/inner-paren-spacing/arrays.js diff --git a/tests/inner-paren-spacing/bind.js b/tests/format/x/js/inner-paren-spacing/bind.js similarity index 100% rename from tests/inner-paren-spacing/bind.js rename to tests/format/x/js/inner-paren-spacing/bind.js diff --git a/tests/inner-paren-spacing/class.js b/tests/format/x/js/inner-paren-spacing/class.js similarity index 100% rename from tests/inner-paren-spacing/class.js rename to tests/format/x/js/inner-paren-spacing/class.js diff --git a/tests/inner-paren-spacing/conditionals.js b/tests/format/x/js/inner-paren-spacing/conditionals.js similarity index 100% rename from tests/inner-paren-spacing/conditionals.js rename to tests/format/x/js/inner-paren-spacing/conditionals.js diff --git a/tests/inner-paren-spacing/destructuring.js b/tests/format/x/js/inner-paren-spacing/destructuring.js similarity index 100% rename from tests/inner-paren-spacing/destructuring.js rename to tests/format/x/js/inner-paren-spacing/destructuring.js diff --git a/tests/inner-paren-spacing/expressions.js b/tests/format/x/js/inner-paren-spacing/expressions.js similarity index 100% rename from tests/inner-paren-spacing/expressions.js rename to tests/format/x/js/inner-paren-spacing/expressions.js diff --git a/tests/inner-paren-spacing/functions.js b/tests/format/x/js/inner-paren-spacing/functions.js similarity index 100% rename from tests/inner-paren-spacing/functions.js rename to tests/format/x/js/inner-paren-spacing/functions.js diff --git a/tests/inner-paren-spacing/html-template-literals.js b/tests/format/x/js/inner-paren-spacing/html-template-literals.js similarity index 100% rename from tests/inner-paren-spacing/html-template-literals.js rename to tests/format/x/js/inner-paren-spacing/html-template-literals.js diff --git a/tests/inner-paren-spacing/import-export.js b/tests/format/x/js/inner-paren-spacing/import-export.js similarity index 100% rename from tests/inner-paren-spacing/import-export.js rename to tests/format/x/js/inner-paren-spacing/import-export.js diff --git a/tests/inner-paren-spacing/jest-test-each.js b/tests/format/x/js/inner-paren-spacing/jest-test-each.js similarity index 100% rename from tests/inner-paren-spacing/jest-test-each.js rename to tests/format/x/js/inner-paren-spacing/jest-test-each.js diff --git a/tests/inner-paren-spacing/jsfmt.spec.js b/tests/format/x/js/inner-paren-spacing/jsfmt.spec.js similarity index 100% rename from tests/inner-paren-spacing/jsfmt.spec.js rename to tests/format/x/js/inner-paren-spacing/jsfmt.spec.js diff --git a/tests/inner-paren-spacing/loops.js b/tests/format/x/js/inner-paren-spacing/loops.js similarity index 100% rename from tests/inner-paren-spacing/loops.js rename to tests/format/x/js/inner-paren-spacing/loops.js diff --git a/tests/inner-paren-spacing/nullish.js b/tests/format/x/js/inner-paren-spacing/nullish.js similarity index 100% rename from tests/inner-paren-spacing/nullish.js rename to tests/format/x/js/inner-paren-spacing/nullish.js diff --git a/tests/inner-paren-spacing/objects.js b/tests/format/x/js/inner-paren-spacing/objects.js similarity index 100% rename from tests/inner-paren-spacing/objects.js rename to tests/format/x/js/inner-paren-spacing/objects.js diff --git a/tests/inner-paren-spacing/return.js b/tests/format/x/js/inner-paren-spacing/return.js similarity index 100% rename from tests/inner-paren-spacing/return.js rename to tests/format/x/js/inner-paren-spacing/return.js diff --git a/tests/inner-paren-spacing/sequence.js b/tests/format/x/js/inner-paren-spacing/sequence.js similarity index 100% rename from tests/inner-paren-spacing/sequence.js rename to tests/format/x/js/inner-paren-spacing/sequence.js diff --git a/tests/inner-paren-spacing/spread.js b/tests/format/x/js/inner-paren-spacing/spread.js similarity index 100% rename from tests/inner-paren-spacing/spread.js rename to tests/format/x/js/inner-paren-spacing/spread.js diff --git a/tests/inner-paren-spacing/switch.js b/tests/format/x/js/inner-paren-spacing/switch.js similarity index 100% rename from tests/inner-paren-spacing/switch.js rename to tests/format/x/js/inner-paren-spacing/switch.js diff --git a/tests/inner-paren-spacing/template-literals.js b/tests/format/x/js/inner-paren-spacing/template-literals.js similarity index 100% rename from tests/inner-paren-spacing/template-literals.js rename to tests/format/x/js/inner-paren-spacing/template-literals.js diff --git a/tests/inner-paren-spacing/ternaries.js b/tests/format/x/js/inner-paren-spacing/ternaries.js similarity index 100% rename from tests/inner-paren-spacing/ternaries.js rename to tests/format/x/js/inner-paren-spacing/ternaries.js diff --git a/tests/inner-paren-spacing/throw.js b/tests/format/x/js/inner-paren-spacing/throw.js similarity index 100% rename from tests/inner-paren-spacing/throw.js rename to tests/format/x/js/inner-paren-spacing/throw.js diff --git a/tests/inner-paren-spacing/try-catch.js b/tests/format/x/js/inner-paren-spacing/try-catch.js similarity index 100% rename from tests/inner-paren-spacing/try-catch.js rename to tests/format/x/js/inner-paren-spacing/try-catch.js diff --git a/tests/inner-paren-spacing/with.js b/tests/format/x/js/inner-paren-spacing/with.js similarity index 100% rename from tests/inner-paren-spacing/with.js rename to tests/format/x/js/inner-paren-spacing/with.js diff --git a/tests/no-indent-chains/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/js/no-indent-chains/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/no-indent-chains/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/js/no-indent-chains/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/no-indent-chains/jsfmt.spec.js b/tests/format/x/js/no-indent-chains/jsfmt.spec.js similarity index 100% rename from tests/no-indent-chains/jsfmt.spec.js rename to tests/format/x/js/no-indent-chains/jsfmt.spec.js diff --git a/tests/no-indent-chains/member-chain.js b/tests/format/x/js/no-indent-chains/member-chain.js similarity index 100% rename from tests/no-indent-chains/member-chain.js rename to tests/format/x/js/no-indent-chains/member-chain.js diff --git a/tests/no-indent-chains/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/js/no-indent-chains/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/no-indent-chains/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/js/no-indent-chains/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/no-indent-chains/with-inner-spacing/jsfmt.spec.js b/tests/format/x/js/no-indent-chains/with-inner-spacing/jsfmt.spec.js similarity index 100% rename from tests/no-indent-chains/with-inner-spacing/jsfmt.spec.js rename to tests/format/x/js/no-indent-chains/with-inner-spacing/jsfmt.spec.js diff --git a/tests/no-semi/additional-member-expressions/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/js/no-semi-additional-member-expressions/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/no-semi/additional-member-expressions/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/js/no-semi-additional-member-expressions/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/no-semi/additional-member-expressions/jsfmt.spec.js b/tests/format/x/js/no-semi-additional-member-expressions/jsfmt.spec.js similarity index 100% rename from tests/no-semi/additional-member-expressions/jsfmt.spec.js rename to tests/format/x/js/no-semi-additional-member-expressions/jsfmt.spec.js diff --git a/tests/no-semi/additional-member-expressions/member-expressions.js b/tests/format/x/js/no-semi-additional-member-expressions/member-expressions.js similarity index 100% rename from tests/no-semi/additional-member-expressions/member-expressions.js rename to tests/format/x/js/no-semi-additional-member-expressions/member-expressions.js diff --git a/tests/space-before-function-paren/eslint-compat/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/js/space-before-function-paren-eslint/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/space-before-function-paren/eslint-compat/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/js/space-before-function-paren-eslint/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/space-before-function-paren/eslint-compat/eslint.js b/tests/format/x/js/space-before-function-paren-eslint/eslint.js similarity index 100% rename from tests/space-before-function-paren/eslint-compat/eslint.js rename to tests/format/x/js/space-before-function-paren-eslint/eslint.js diff --git a/tests/space-before-function-paren/eslint-compat/jsfmt.spec.js b/tests/format/x/js/space-before-function-paren-eslint/jsfmt.spec.js similarity index 100% rename from tests/space-before-function-paren/eslint-compat/jsfmt.spec.js rename to tests/format/x/js/space-before-function-paren-eslint/jsfmt.spec.js diff --git a/tests/standard/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/js/standard/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/standard/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/js/standard/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/standard/correct-ternaries.js b/tests/format/x/js/standard/correct-ternaries.js similarity index 100% rename from tests/standard/correct-ternaries.js rename to tests/format/x/js/standard/correct-ternaries.js diff --git a/tests/standard/correct.js b/tests/format/x/js/standard/correct.js similarity index 100% rename from tests/standard/correct.js rename to tests/format/x/js/standard/correct.js diff --git a/tests/standard/flow/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/js/standard/flow-types/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/standard/flow/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/js/standard/flow-types/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/standard/flow/correct.js b/tests/format/x/js/standard/flow-types/correct.js similarity index 100% rename from tests/standard/flow/correct.js rename to tests/format/x/js/standard/flow-types/correct.js diff --git a/tests/standard/flow/incorrect.js b/tests/format/x/js/standard/flow-types/incorrect.js similarity index 100% rename from tests/standard/flow/incorrect.js rename to tests/format/x/js/standard/flow-types/incorrect.js diff --git a/tests/standard/flow/jsfmt.spec.js b/tests/format/x/js/standard/flow-types/jsfmt.spec.js similarity index 100% rename from tests/standard/flow/jsfmt.spec.js rename to tests/format/x/js/standard/flow-types/jsfmt.spec.js diff --git a/tests/standard/incorrect-ternaries.js b/tests/format/x/js/standard/incorrect-ternaries.js similarity index 100% rename from tests/standard/incorrect-ternaries.js rename to tests/format/x/js/standard/incorrect-ternaries.js diff --git a/tests/standard/incorrect.js b/tests/format/x/js/standard/incorrect.js similarity index 100% rename from tests/standard/incorrect.js rename to tests/format/x/js/standard/incorrect.js diff --git a/tests/standard/jsfmt.spec.js b/tests/format/x/js/standard/jsfmt.spec.js similarity index 100% rename from tests/standard/jsfmt.spec.js rename to tests/format/x/js/standard/jsfmt.spec.js diff --git a/tests/ternary-object-expressions/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/js/ternary-object-expressions/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/ternary-object-expressions/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/js/ternary-object-expressions/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/ternary-object-expressions/crewdress.js b/tests/format/x/js/ternary-object-expressions/crewdress.js similarity index 100% rename from tests/ternary-object-expressions/crewdress.js rename to tests/format/x/js/ternary-object-expressions/crewdress.js diff --git a/tests/ternary-object-expressions/jsfmt.spec.js b/tests/format/x/js/ternary-object-expressions/jsfmt.spec.js similarity index 100% rename from tests/ternary-object-expressions/jsfmt.spec.js rename to tests/format/x/js/ternary-object-expressions/jsfmt.spec.js diff --git a/tests/ternary-object-expressions/nested-ternary-promises.js b/tests/format/x/js/ternary-object-expressions/nested-ternary-promises.js similarity index 100% rename from tests/ternary-object-expressions/nested-ternary-promises.js rename to tests/format/x/js/ternary-object-expressions/nested-ternary-promises.js diff --git a/tests/ternary-object-expressions/nesting-object-ternary-expression.js b/tests/format/x/js/ternary-object-expressions/nesting-object-ternary-expression.js similarity index 100% rename from tests/ternary-object-expressions/nesting-object-ternary-expression.js rename to tests/format/x/js/ternary-object-expressions/nesting-object-ternary-expression.js diff --git a/tests/ternary-object-expressions/nesting-ternary-arrays.js b/tests/format/x/js/ternary-object-expressions/nesting-ternary-arrays.js similarity index 100% rename from tests/ternary-object-expressions/nesting-ternary-arrays.js rename to tests/format/x/js/ternary-object-expressions/nesting-ternary-arrays.js diff --git a/tests/ternary-object-expressions/with-balanced-formatting/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/js/ternary-object-expressions/with-balanced-formatting/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/ternary-object-expressions/with-balanced-formatting/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/js/ternary-object-expressions/with-balanced-formatting/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/ternary-object-expressions/with-balanced-formatting/jsfmt.spec.js b/tests/format/x/js/ternary-object-expressions/with-balanced-formatting/jsfmt.spec.js similarity index 100% rename from tests/ternary-object-expressions/with-balanced-formatting/jsfmt.spec.js rename to tests/format/x/js/ternary-object-expressions/with-balanced-formatting/jsfmt.spec.js diff --git a/tests/yield-star-spacing/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/js/yield-star-spacing/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/yield-star-spacing/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/js/yield-star-spacing/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/yield-star-spacing/correct.js b/tests/format/x/js/yield-star-spacing/correct.js similarity index 100% rename from tests/yield-star-spacing/correct.js rename to tests/format/x/js/yield-star-spacing/correct.js diff --git a/tests/yield-star-spacing/incorrect.js b/tests/format/x/js/yield-star-spacing/incorrect.js similarity index 100% rename from tests/yield-star-spacing/incorrect.js rename to tests/format/x/js/yield-star-spacing/incorrect.js diff --git a/tests/yield-star-spacing/jsfmt.spec.js b/tests/format/x/js/yield-star-spacing/jsfmt.spec.js similarity index 100% rename from tests/yield-star-spacing/jsfmt.spec.js rename to tests/format/x/js/yield-star-spacing/jsfmt.spec.js diff --git a/tests/typescript_generic/function-expression/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/typescript/generic-function-expression/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/typescript_generic/function-expression/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/typescript/generic-function-expression/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/typescript_generic/function-expression/function-expression.ts b/tests/format/x/typescript/generic-function-expression/function-expression.ts similarity index 100% rename from tests/typescript_generic/function-expression/function-expression.ts rename to tests/format/x/typescript/generic-function-expression/function-expression.ts diff --git a/tests/typescript_generic/function-expression/jsfmt.spec.js b/tests/format/x/typescript/generic-function-expression/jsfmt.spec.js similarity index 100% rename from tests/typescript_generic/function-expression/jsfmt.spec.js rename to tests/format/x/typescript/generic-function-expression/jsfmt.spec.js diff --git a/tests/space-before-function-paren/tslint-compat/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/typescript/space-before-function-paren-tslint/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/space-before-function-paren/tslint-compat/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/typescript/space-before-function-paren-tslint/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/space-before-function-paren/tslint-compat/jsfmt.spec.js b/tests/format/x/typescript/space-before-function-paren-tslint/jsfmt.spec.js similarity index 100% rename from tests/space-before-function-paren/tslint-compat/jsfmt.spec.js rename to tests/format/x/typescript/space-before-function-paren-tslint/jsfmt.spec.js diff --git a/tests/space-before-function-paren/tslint-compat/tsbaz.ts b/tests/format/x/typescript/space-before-function-paren-tslint/tsbaz.ts similarity index 100% rename from tests/space-before-function-paren/tslint-compat/tsbaz.ts rename to tests/format/x/typescript/space-before-function-paren-tslint/tsbaz.ts diff --git a/tests/space-before-function-paren/tslint-compat/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/typescript/space-before-function-paren-tslint/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/space-before-function-paren/tslint-compat/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/typescript/space-before-function-paren-tslint/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/space-before-function-paren/tslint-compat/with-inner-spacing/jsfmt.spec.js b/tests/format/x/typescript/space-before-function-paren-tslint/with-inner-spacing/jsfmt.spec.js similarity index 100% rename from tests/space-before-function-paren/tslint-compat/with-inner-spacing/jsfmt.spec.js rename to tests/format/x/typescript/space-before-function-paren-tslint/with-inner-spacing/jsfmt.spec.js diff --git a/tests/standard/typescript/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/typescript/ts-standard/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/standard/typescript/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/typescript/ts-standard/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/standard/typescript/correct.ts b/tests/format/x/typescript/ts-standard/correct.ts similarity index 100% rename from tests/standard/typescript/correct.ts rename to tests/format/x/typescript/ts-standard/correct.ts diff --git a/tests/standard/typescript/incorrect.ts b/tests/format/x/typescript/ts-standard/incorrect.ts similarity index 100% rename from tests/standard/typescript/incorrect.ts rename to tests/format/x/typescript/ts-standard/incorrect.ts diff --git a/tests/standard/typescript/jsfmt.spec.js b/tests/format/x/typescript/ts-standard/jsfmt.spec.js similarity index 100% rename from tests/standard/typescript/jsfmt.spec.js rename to tests/format/x/typescript/ts-standard/jsfmt.spec.js diff --git a/tests/standard/typescript/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap b/tests/format/x/typescript/ts-standard/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/standard/typescript/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap rename to tests/format/x/typescript/ts-standard/with-inner-spacing/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/standard/typescript/with-inner-spacing/jsfmt.spec.js b/tests/format/x/typescript/ts-standard/with-inner-spacing/jsfmt.spec.js similarity index 100% rename from tests/standard/typescript/with-inner-spacing/jsfmt.spec.js rename to tests/format/x/typescript/ts-standard/with-inner-spacing/jsfmt.spec.js