diff --git a/package.json b/package.json index 2cd8ff1ce..737011602 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "test": "jest", "format": "./bin/prettier.js --write", "format:single": "npm run format -- src/printer.js", - "format:all": "npm run format -- index.js src/*.js bin/*.js", + "format:all": "npm run format -- index.js \"{src,bin,tests_config,scripts}/*.js\" \"tests/**/jsfmt.spec.js\"", "build:docs": "rollup -c docs/rollup.config.js" }, "jest": { diff --git a/scripts/sync-flow-tests.js b/scripts/sync-flow-tests.js index 68a82f74f..c9eb65c45 100644 --- a/scripts/sync-flow-tests.js +++ b/scripts/sync-flow-tests.js @@ -36,7 +36,7 @@ function syncTests(syncDir) { "Couldn't find any files to copy.", `Please make sure that \`${syncDir}\` exists and contains the flow tests.` ].join("\n") - ) + ); } const specContents = specFiles.reduce((obj, specFile) => { diff --git a/tests/arrow-call/jsfmt.spec.js b/tests/arrow-call/jsfmt.spec.js index 220f446b5..9b85c446c 100644 --- a/tests/arrow-call/jsfmt.spec.js +++ b/tests/arrow-call/jsfmt.spec.js @@ -1,2 +1,2 @@ run_spec(__dirname); -run_spec(__dirname, { trailingComma: 'all' }); +run_spec(__dirname, { trailingComma: "all" }); diff --git a/tests/bracketSpacing/jsfmt.spec.js b/tests/bracketSpacing/jsfmt.spec.js index bb1d92705..deb0fd82a 100644 --- a/tests/bracketSpacing/jsfmt.spec.js +++ b/tests/bracketSpacing/jsfmt.spec.js @@ -1,2 +1,2 @@ run_spec(__dirname, null, ["typescript"]); -run_spec(__dirname, { bracketSpacing: false }, ["typescript"]); \ No newline at end of file +run_spec(__dirname, { bracketSpacing: false }, ["typescript"]); diff --git a/tests/es6modules/jsfmt.spec.js b/tests/es6modules/jsfmt.spec.js index 668c3f6f4..0392b2151 100644 --- a/tests/es6modules/jsfmt.spec.js +++ b/tests/es6modules/jsfmt.spec.js @@ -1,3 +1,3 @@ run_spec(__dirname); // FIXME export_default_function_declaration_async.js flow != babylon output -run_spec(__dirname, { parser: "babylon" }); \ No newline at end of file +run_spec(__dirname, { parser: "babylon" }); diff --git a/tests/export/jsfmt.spec.js b/tests/export/jsfmt.spec.js index bb1d92705..deb0fd82a 100644 --- a/tests/export/jsfmt.spec.js +++ b/tests/export/jsfmt.spec.js @@ -1,2 +1,2 @@ run_spec(__dirname, null, ["typescript"]); -run_spec(__dirname, { bracketSpacing: false }, ["typescript"]); \ No newline at end of file +run_spec(__dirname, { bracketSpacing: false }, ["typescript"]); diff --git a/tests/flow_comments/jsfmt.spec.js b/tests/flow_comments/jsfmt.spec.js index 51588ad1e..4d7b83a70 100644 --- a/tests/flow_comments/jsfmt.spec.js +++ b/tests/flow_comments/jsfmt.spec.js @@ -1,3 +1,3 @@ run_spec(__dirname); // FIXME arrow.js flow != babylon output -run_spec(__dirname, { parser: "babylon" }); \ No newline at end of file +run_spec(__dirname, { parser: "babylon" }); diff --git a/tests/flow_generic/jsfmt.spec.js b/tests/flow_generic/jsfmt.spec.js index ab1508e8d..f2ad8bc30 100644 --- a/tests/flow_generic/jsfmt.spec.js +++ b/tests/flow_generic/jsfmt.spec.js @@ -1,2 +1,2 @@ run_spec(__dirname, null, ["babylon"]); -run_spec(__dirname, { trailingComma: 'all' }, ["babylon"]); +run_spec(__dirname, { trailingComma: "all" }, ["babylon"]); diff --git a/tests/flow_object_order/jsfmt.spec.js b/tests/flow_object_order/jsfmt.spec.js index fc1bbd4e9..9b85c446c 100644 --- a/tests/flow_object_order/jsfmt.spec.js +++ b/tests/flow_object_order/jsfmt.spec.js @@ -1,2 +1,2 @@ run_spec(__dirname); -run_spec(__dirname, {trailingComma: 'all'}); +run_spec(__dirname, { trailingComma: "all" }); diff --git a/tests/jsx_escape/jsfmt.spec.js b/tests/jsx_escape/jsfmt.spec.js index 69acff871..3de20299e 100644 --- a/tests/jsx_escape/jsfmt.spec.js +++ b/tests/jsx_escape/jsfmt.spec.js @@ -1,3 +1,3 @@ -run_spec(__dirname) +run_spec(__dirname); // FIXME nbsp.js flow != babylon output, waiting for: https://github.com/babel/babylon/pull/344 run_spec(__dirname, { parser: "babylon" }); diff --git a/tests/quotes/jsfmt.spec.js b/tests/quotes/jsfmt.spec.js index 04f2867bd..17cade240 100644 --- a/tests/quotes/jsfmt.spec.js +++ b/tests/quotes/jsfmt.spec.js @@ -1,2 +1,2 @@ run_spec(__dirname); -run_spec(__dirname, { singleQuote: true }); \ No newline at end of file +run_spec(__dirname, { singleQuote: true }); diff --git a/tests/tabWith/jsfmt.spec.js b/tests/tabWith/jsfmt.spec.js index 8f2eb802c..1ec983a6b 100644 --- a/tests/tabWith/jsfmt.spec.js +++ b/tests/tabWith/jsfmt.spec.js @@ -1,2 +1,2 @@ run_spec(__dirname); -run_spec(__dirname, { tabWidth: 4 }); \ No newline at end of file +run_spec(__dirname, { tabWidth: 4 }); diff --git a/tests/template_align/jsfmt.spec.js b/tests/template_align/jsfmt.spec.js index 2e6e1e55e..27ef85081 100644 --- a/tests/template_align/jsfmt.spec.js +++ b/tests/template_align/jsfmt.spec.js @@ -1,2 +1,2 @@ run_spec(__dirname, null, ["typescript"]); -run_spec(__dirname, {useTabs: true, tabWidth: 8}, ["typescript"]); +run_spec(__dirname, { useTabs: true, tabWidth: 8 }, ["typescript"]); diff --git a/tests/ternaries/jsfmt.spec.js b/tests/ternaries/jsfmt.spec.js index 129171846..84d257115 100644 --- a/tests/ternaries/jsfmt.spec.js +++ b/tests/ternaries/jsfmt.spec.js @@ -1,2 +1,2 @@ run_spec(__dirname, null, ["typescript"]); -run_spec(__dirname, { tabWidth: 4 }, ["typescript"]); \ No newline at end of file +run_spec(__dirname, { tabWidth: 4 }, ["typescript"]); diff --git a/tests/typescript_as/jsfmt.spec.js b/tests/typescript_as/jsfmt.spec.js index 379b0d723..bc085c48c 100644 --- a/tests/typescript_as/jsfmt.spec.js +++ b/tests/typescript_as/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, {parser: "typescript"}); +run_spec(__dirname, { parser: "typescript" }); diff --git a/tests/typescript_tsx/jsfmt.spec.js b/tests/typescript_tsx/jsfmt.spec.js index 379b0d723..bc085c48c 100644 --- a/tests/typescript_tsx/jsfmt.spec.js +++ b/tests/typescript_tsx/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, {parser: "typescript"}); +run_spec(__dirname, { parser: "typescript" }); diff --git a/tests_config/run_spec.js b/tests_config/run_spec.js index 447ddb964..7bed96ff0 100644 --- a/tests_config/run_spec.js +++ b/tests_config/run_spec.js @@ -5,7 +5,7 @@ const extname = require("path").extname; const prettier = require("../"); const types = require("../src/ast-types"); const parser = require("../src/parser"); -const massageAST = require('../src/clean-ast.js').massageAST; +const massageAST = require("../src/clean-ast.js").massageAST; const AST_COMPARE = process.env["AST_COMPARE"]; const VERIFY_ALL_PARSERS = process.env["VERIFY_ALL_PARSERS"] || false; @@ -48,7 +48,10 @@ function run_spec(dirname, options, additionalParsers) { let ppastMassaged; let pperr = null; try { - const ppast = parse(prettyprint(source, path, mergedOptions), mergedOptions) + const ppast = parse( + prettyprint(source, path, mergedOptions), + mergedOptions + ); ppastMassaged = massageAST(ppast); } catch (e) { pperr = e.stack; @@ -75,7 +78,10 @@ function stripLocation(ast) { const newObj = {}; for (var key in ast) { if ( - key === "loc" || key === "range" || key === "raw" || key === "comments" + key === "loc" || + key === "range" || + key === "raw" || + key === "comments" ) { continue; }