From 481ea90b8fb17aefba0d5647ee0b3f5dc7f4b30e Mon Sep 17 00:00:00 2001 From: fisker Date: Tue, 25 Aug 2020 18:05:17 +0800 Subject: [PATCH 01/11] HTML: Fix format on `style[lang="sass"]` --- changelog_unreleased/html/pr-9051.md | 23 ++++++ src/language-html/utils.js | 4 +- .../css}/__snapshots__/jsfmt.spec.js.snap | 0 .../css}/html-with-css-style.html | 0 .../css}/jsfmt.spec.js | 0 .../js}/__snapshots__/jsfmt.spec.js.snap | 0 .../js}/html-with-js-script.html | 0 .../js}/jsfmt.spec.js | 0 .../js}/script-tag-escaping.html | 0 .../__snapshots__/jsfmt.spec.js.snap | 0 .../markdown}/html-with-markdown-script.html | 0 .../markdown}/jsfmt.spec.js | 0 .../ts}/__snapshots__/jsfmt.spec.js.snap | 0 .../ts}/html-with-ts-script.html | 0 .../ts}/jsfmt.spec.js | 0 .../unknown/__snapshots__/jsfmt.spec.js.snap | 71 +++++++++++++++++++ tests/html/multiparser/unknown/jsfmt.spec.js | 1 + .../html/multiparser/unknown/unknow-lang.html | 29 ++++++++ .../__snapshots__/jsfmt.spec.js.snap | 60 ++++++++++++++++ tests/vue/multiparser/unknow.vue | 24 +++++++ 20 files changed, 210 insertions(+), 2 deletions(-) create mode 100644 changelog_unreleased/html/pr-9051.md rename tests/html/{multiparser-css => multiparser/css}/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/html/{multiparser-css => multiparser/css}/html-with-css-style.html (100%) rename tests/html/{multiparser-css => multiparser/css}/jsfmt.spec.js (100%) rename tests/html/{multiparser-js => multiparser/js}/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/html/{multiparser-js => multiparser/js}/html-with-js-script.html (100%) rename tests/html/{multiparser-js => multiparser/js}/jsfmt.spec.js (100%) rename tests/html/{multiparser-js => multiparser/js}/script-tag-escaping.html (100%) rename tests/html/{multiparser-markdown => multiparser/markdown}/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/html/{multiparser-markdown => multiparser/markdown}/html-with-markdown-script.html (100%) rename tests/html/{multiparser-markdown => multiparser/markdown}/jsfmt.spec.js (100%) rename tests/html/{multiparser-ts => multiparser/ts}/__snapshots__/jsfmt.spec.js.snap (100%) rename tests/html/{multiparser-ts => multiparser/ts}/html-with-ts-script.html (100%) rename tests/html/{multiparser-ts => multiparser/ts}/jsfmt.spec.js (100%) create mode 100644 tests/html/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap create mode 100644 tests/html/multiparser/unknown/jsfmt.spec.js create mode 100644 tests/html/multiparser/unknown/unknow-lang.html create mode 100644 tests/vue/multiparser/unknow.vue diff --git a/changelog_unreleased/html/pr-9051.md b/changelog_unreleased/html/pr-9051.md new file mode 100644 index 000000000000..1d49bc7dde7d --- /dev/null +++ b/changelog_unreleased/html/pr-9051.md @@ -0,0 +1,23 @@ +#### Fix format on `style[lang="sass"]` ([#9051](https://github.com/prettier/prettier/pull/9051) by [@fisker](https://github.com/fisker)) + +Optional description if it makes sense. + + +```jsx + + + + + + + + +``` diff --git a/src/language-html/utils.js b/src/language-html/utils.js index 6424395ec916..e4ad67118e50 100644 --- a/src/language-html/utils.js +++ b/src/language-html/utils.js @@ -399,7 +399,7 @@ function _inferScriptParser(node) { function inferStyleParser(node) { const { lang } = node.attrMap; - if (lang === "postcss" || lang === "css") { + if (!lang || lang === "postcss" || lang === "css") { return "css"; } @@ -421,7 +421,7 @@ function inferScriptParser(node, options) { } if (node.name === "style") { - return inferStyleParser(node) || "css"; + return inferStyleParser(node); } if (options && isVueNonHtmlBlock(node, options)) { diff --git a/tests/html/multiparser-css/__snapshots__/jsfmt.spec.js.snap b/tests/html/multiparser/css/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/html/multiparser-css/__snapshots__/jsfmt.spec.js.snap rename to tests/html/multiparser/css/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/html/multiparser-css/html-with-css-style.html b/tests/html/multiparser/css/html-with-css-style.html similarity index 100% rename from tests/html/multiparser-css/html-with-css-style.html rename to tests/html/multiparser/css/html-with-css-style.html diff --git a/tests/html/multiparser-css/jsfmt.spec.js b/tests/html/multiparser/css/jsfmt.spec.js similarity index 100% rename from tests/html/multiparser-css/jsfmt.spec.js rename to tests/html/multiparser/css/jsfmt.spec.js diff --git a/tests/html/multiparser-js/__snapshots__/jsfmt.spec.js.snap b/tests/html/multiparser/js/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/html/multiparser-js/__snapshots__/jsfmt.spec.js.snap rename to tests/html/multiparser/js/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/html/multiparser-js/html-with-js-script.html b/tests/html/multiparser/js/html-with-js-script.html similarity index 100% rename from tests/html/multiparser-js/html-with-js-script.html rename to tests/html/multiparser/js/html-with-js-script.html diff --git a/tests/html/multiparser-js/jsfmt.spec.js b/tests/html/multiparser/js/jsfmt.spec.js similarity index 100% rename from tests/html/multiparser-js/jsfmt.spec.js rename to tests/html/multiparser/js/jsfmt.spec.js diff --git a/tests/html/multiparser-js/script-tag-escaping.html b/tests/html/multiparser/js/script-tag-escaping.html similarity index 100% rename from tests/html/multiparser-js/script-tag-escaping.html rename to tests/html/multiparser/js/script-tag-escaping.html diff --git a/tests/html/multiparser-markdown/__snapshots__/jsfmt.spec.js.snap b/tests/html/multiparser/markdown/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/html/multiparser-markdown/__snapshots__/jsfmt.spec.js.snap rename to tests/html/multiparser/markdown/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/html/multiparser-markdown/html-with-markdown-script.html b/tests/html/multiparser/markdown/html-with-markdown-script.html similarity index 100% rename from tests/html/multiparser-markdown/html-with-markdown-script.html rename to tests/html/multiparser/markdown/html-with-markdown-script.html diff --git a/tests/html/multiparser-markdown/jsfmt.spec.js b/tests/html/multiparser/markdown/jsfmt.spec.js similarity index 100% rename from tests/html/multiparser-markdown/jsfmt.spec.js rename to tests/html/multiparser/markdown/jsfmt.spec.js diff --git a/tests/html/multiparser-ts/__snapshots__/jsfmt.spec.js.snap b/tests/html/multiparser/ts/__snapshots__/jsfmt.spec.js.snap similarity index 100% rename from tests/html/multiparser-ts/__snapshots__/jsfmt.spec.js.snap rename to tests/html/multiparser/ts/__snapshots__/jsfmt.spec.js.snap diff --git a/tests/html/multiparser-ts/html-with-ts-script.html b/tests/html/multiparser/ts/html-with-ts-script.html similarity index 100% rename from tests/html/multiparser-ts/html-with-ts-script.html rename to tests/html/multiparser/ts/html-with-ts-script.html diff --git a/tests/html/multiparser-ts/jsfmt.spec.js b/tests/html/multiparser/ts/jsfmt.spec.js similarity index 100% rename from tests/html/multiparser-ts/jsfmt.spec.js rename to tests/html/multiparser/ts/jsfmt.spec.js diff --git a/tests/html/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap b/tests/html/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap new file mode 100644 index 000000000000..f80cf8cc3942 --- /dev/null +++ b/tests/html/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap @@ -0,0 +1,71 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`unknow-lang.html format 1`] = ` +====================================options===================================== +parsers: ["html"] +printWidth: 80 + | printWidth +=====================================input====================================== + + + + + + Document + + + + + + + + + + + + +=====================================output===================================== + + + + + + Document + + + + + + + + + + + + +================================================================================ +`; diff --git a/tests/html/multiparser/unknown/jsfmt.spec.js b/tests/html/multiparser/unknown/jsfmt.spec.js new file mode 100644 index 000000000000..53763df9b20b --- /dev/null +++ b/tests/html/multiparser/unknown/jsfmt.spec.js @@ -0,0 +1 @@ +run_spec(__dirname, ["html"]); diff --git a/tests/html/multiparser/unknown/unknow-lang.html b/tests/html/multiparser/unknown/unknow-lang.html new file mode 100644 index 000000000000..95442f66bbfd --- /dev/null +++ b/tests/html/multiparser/unknown/unknow-lang.html @@ -0,0 +1,29 @@ + + + + + + Document + + + + + + + + + + + diff --git a/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap b/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap index 4d1047328e9f..aa4df52b8c47 100644 --- a/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap +++ b/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap @@ -164,6 +164,66 @@ printWidth: 80 ================================================================================ `; +exports[`unknow.vue format 1`] = ` +====================================options===================================== +parsers: ["vue"] +printWidth: 80 + | printWidth +=====================================input====================================== + + + + + + + + + + +=====================================output===================================== + + + + + + + + + + +================================================================================ +`; + exports[`vue-component.vue format 1`] = ` ====================================options===================================== parsers: ["vue"] diff --git a/tests/vue/multiparser/unknow.vue b/tests/vue/multiparser/unknow.vue new file mode 100644 index 000000000000..2f01fd114351 --- /dev/null +++ b/tests/vue/multiparser/unknow.vue @@ -0,0 +1,24 @@ + + + + + + + + + From b4c262f575faa5d19e062346c635fa5099cc8fe9 Mon Sep 17 00:00:00 2001 From: fisker Date: Tue, 25 Aug 2020 18:43:42 +0800 Subject: [PATCH 02/11] Update logic --- src/language-html/utils.js | 35 ++++++++++--------- .../__snapshots__/jsfmt.spec.js.snap | 32 ++++++++++------- 2 files changed, 39 insertions(+), 28 deletions(-) diff --git a/src/language-html/utils.js b/src/language-html/utils.js index e4ad67118e50..8863c1e64f63 100644 --- a/src/language-html/utils.js +++ b/src/language-html/utils.js @@ -365,8 +365,18 @@ function hasNonTextChild(node) { } function _inferScriptParser(node) { - const { type, lang } = node.attrMap; + if (node.name !== "script") { + return; + } + + const { type, lang, src } = node.attrMap; + + if (src) { + return; + } + if ( + (!lang && !type) || type === "module" || type === "text/javascript" || type === "text/babel" || @@ -398,6 +408,10 @@ function _inferScriptParser(node) { } function inferStyleParser(node) { + if (node.name !== "style") { + return; + } + const { lang } = node.attrMap; if (!lang || lang === "postcss" || lang === "css") { return "css"; @@ -413,24 +427,13 @@ function inferStyleParser(node) { } function inferScriptParser(node, options) { - if (node.name === "script" && !node.attrMap.src) { - if (!node.attrMap.lang && !node.attrMap.type) { - return "babel"; - } - return _inferScriptParser(node); - } + let parser = _inferScriptParser(node) || inferStyleParser(node); - if (node.name === "style") { - return inferStyleParser(node); + if (!parser && options && isVueNonHtmlBlock(node, options)) { + parser = getParserName(node.attrMap.lang, options); } - if (options && isVueNonHtmlBlock(node, options)) { - return ( - _inferScriptParser(node) || - inferStyleParser(node) || - getParserName(node.attrMap.lang, options) - ); - } + return parser; } function isBlockLikeCssDisplay(cssDisplay) { diff --git a/tests/vue/custom_block/__snapshots__/jsfmt.spec.js.snap b/tests/vue/custom_block/__snapshots__/jsfmt.spec.js.snap index 80e2b4bb4d50..e0c79c45a9bc 100644 --- a/tests/vue/custom_block/__snapshots__/jsfmt.spec.js.snap +++ b/tests/vue/custom_block/__snapshots__/jsfmt.spec.js.snap @@ -1438,9 +1438,11 @@ const foo = "foo"; 123 -{ - foo: "bar" -} + + { + foo: "bar"; +} + ================================================================================ `; @@ -1501,9 +1503,11 @@ const foo = "foo"; 123 -{ - foo: "bar" -} + + { + foo: "bar"; +} + ================================================================================ `; @@ -1564,9 +1568,11 @@ const foo = "foo"; 123 -{ - foo: "bar" -} + + { + foo: "bar"; +} + ================================================================================ `; @@ -1626,9 +1632,11 @@ const foo = "foo"; 123 -{ - foo: "bar" -} + + { + foo: "bar"; +} + ================================================================================ `; From 100a57744f9cff96347c0f8e78ca6b272d6529f2 Mon Sep 17 00:00:00 2001 From: fisker Date: Tue, 25 Aug 2020 19:00:14 +0800 Subject: [PATCH 03/11] Fix vue custom block parser --- src/language-html/utils.js | 31 +++++++++--------- .../__snapshots__/jsfmt.spec.js.snap | 32 +++++++------------ 2 files changed, 28 insertions(+), 35 deletions(-) diff --git a/src/language-html/utils.js b/src/language-html/utils.js index 8863c1e64f63..10da9e163f92 100644 --- a/src/language-html/utils.js +++ b/src/language-html/utils.js @@ -365,18 +365,8 @@ function hasNonTextChild(node) { } function _inferScriptParser(node) { - if (node.name !== "script") { - return; - } - - const { type, lang, src } = node.attrMap; - - if (src) { - return; - } - + const { type, lang } = node.attrMap; if ( - (!lang && !type) || type === "module" || type === "text/javascript" || type === "text/babel" || @@ -427,13 +417,24 @@ function inferStyleParser(node) { } function inferScriptParser(node, options) { - let parser = _inferScriptParser(node) || inferStyleParser(node); + if (node.name === "script" && !node.attrMap.src) { + if (!node.attrMap.lang && !node.attrMap.type) { + return "babel"; + } + return _inferScriptParser(node); + } - if (!parser && options && isVueNonHtmlBlock(node, options)) { - parser = getParserName(node.attrMap.lang, options); + if (node.name === "style") { + return inferStyleParser(node); } - return parser; + if (options && isVueNonHtmlBlock(node, options)) { + return ( + _inferScriptParser(node) || + inferStyleParser(node) || + getParserName(node.attrMap.lang, options) + ); + } } function isBlockLikeCssDisplay(cssDisplay) { diff --git a/tests/vue/custom_block/__snapshots__/jsfmt.spec.js.snap b/tests/vue/custom_block/__snapshots__/jsfmt.spec.js.snap index e0c79c45a9bc..80e2b4bb4d50 100644 --- a/tests/vue/custom_block/__snapshots__/jsfmt.spec.js.snap +++ b/tests/vue/custom_block/__snapshots__/jsfmt.spec.js.snap @@ -1438,11 +1438,9 @@ const foo = "foo"; 123 - - { - foo: "bar"; -} - +{ + foo: "bar" +} ================================================================================ `; @@ -1503,11 +1501,9 @@ const foo = "foo"; 123 - - { - foo: "bar"; -} - +{ + foo: "bar" +} ================================================================================ `; @@ -1568,11 +1564,9 @@ const foo = "foo"; 123 - - { - foo: "bar"; -} - +{ + foo: "bar" +} ================================================================================ `; @@ -1632,11 +1626,9 @@ const foo = "foo"; 123 - - { - foo: "bar"; -} - +{ + foo: "bar" +} ================================================================================ `; From 9f79b086cc4beea16f03edb9f0afa801f420b401 Mon Sep 17 00:00:00 2001 From: fisker Date: Tue, 25 Aug 2020 19:01:48 +0800 Subject: [PATCH 04/11] Fix changelog --- changelog_unreleased/TEMPLATE.md | 2 +- changelog_unreleased/html/pr-9051.md | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/changelog_unreleased/TEMPLATE.md b/changelog_unreleased/TEMPLATE.md index a7ebe3c0aaa9..268377304b92 100644 --- a/changelog_unreleased/TEMPLATE.md +++ b/changelog_unreleased/TEMPLATE.md @@ -24,7 +24,7 @@ #### Title ([#XXXX](https://github.com/prettier/prettier/pull/XXXX) by [@user](https://github.com/user)) -Optional description if it makes sense. + ```jsx diff --git a/changelog_unreleased/html/pr-9051.md b/changelog_unreleased/html/pr-9051.md index 1d49bc7dde7d..63c99d04719b 100644 --- a/changelog_unreleased/html/pr-9051.md +++ b/changelog_unreleased/html/pr-9051.md @@ -1,7 +1,5 @@ #### Fix format on `style[lang="sass"]` ([#9051](https://github.com/prettier/prettier/pull/9051) by [@fisker](https://github.com/fisker)) -Optional description if it makes sense. - ```jsx From 0719a03597fa2e49e588ab2b78c483c0abcf9390 Mon Sep 17 00:00:00 2001 From: fisker Date: Tue, 25 Aug 2020 19:07:02 +0800 Subject: [PATCH 05/11] Simplify logic --- src/language-html/utils.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/language-html/utils.js b/src/language-html/utils.js index 10da9e163f92..e21cf360dd5f 100644 --- a/src/language-html/utils.js +++ b/src/language-html/utils.js @@ -398,10 +398,6 @@ function _inferScriptParser(node) { } function inferStyleParser(node) { - if (node.name !== "style") { - return; - } - const { lang } = node.attrMap; if (!lang || lang === "postcss" || lang === "css") { return "css"; @@ -431,7 +427,6 @@ function inferScriptParser(node, options) { if (options && isVueNonHtmlBlock(node, options)) { return ( _inferScriptParser(node) || - inferStyleParser(node) || getParserName(node.attrMap.lang, options) ); } From 58539a03e4cfde962fc9fb882bb59bb40707c915 Mon Sep 17 00:00:00 2001 From: "prettifier[bot]" <45367598+prettifier[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2020 11:07:27 +0000 Subject: [PATCH 06/11] Format 0719a03 --- src/language-html/utils.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/language-html/utils.js b/src/language-html/utils.js index e21cf360dd5f..2e74a0ffcced 100644 --- a/src/language-html/utils.js +++ b/src/language-html/utils.js @@ -426,8 +426,7 @@ function inferScriptParser(node, options) { if (options && isVueNonHtmlBlock(node, options)) { return ( - _inferScriptParser(node) || - getParserName(node.attrMap.lang, options) + _inferScriptParser(node) || getParserName(node.attrMap.lang, options) ); } } From 5aa8b06afda1bba848ee18b7c84f82b9b9f77a2e Mon Sep 17 00:00:00 2001 From: fisker Date: Tue, 25 Aug 2020 19:45:06 +0800 Subject: [PATCH 07/11] Fix unstableTests path --- tests_config/run_spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests_config/run_spec.js b/tests_config/run_spec.js index 75cd10327db0..795b2d0912ef 100644 --- a/tests_config/run_spec.js +++ b/tests_config/run_spec.js @@ -36,7 +36,7 @@ const unstableTests = new Map( "js/comments-closure-typecast/iife.js", "markdown/spec/example-234.md", "markdown/spec/example-235.md", - "html/multiparser-js/script-tag-escaping.html", + "html/multiparser/js/script-tag-escaping.html", [ "js/multiparser-markdown/codeblock.js", (options) => options.proseWrap === "always", From 665d34406bef6180194d597a963f7278704ac83c Mon Sep 17 00:00:00 2001 From: fisker Date: Tue, 25 Aug 2020 22:14:36 +0800 Subject: [PATCH 08/11] Rename --- .../unknown/__snapshots__/jsfmt.spec.js.snap | 2 +- .../html/multiparser/unknown/unknow-lang.html | 29 ------------------- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/vue/multiparser/unknow.vue | 24 --------------- 4 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 tests/html/multiparser/unknown/unknow-lang.html delete mode 100644 tests/vue/multiparser/unknow.vue diff --git a/tests/html/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap b/tests/html/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap index f80cf8cc3942..e3c02e81857c 100644 --- a/tests/html/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap +++ b/tests/html/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`unknow-lang.html format 1`] = ` +exports[`unknown-lang.html format 1`] = ` ====================================options===================================== parsers: ["html"] printWidth: 80 diff --git a/tests/html/multiparser/unknown/unknow-lang.html b/tests/html/multiparser/unknown/unknow-lang.html deleted file mode 100644 index 95442f66bbfd..000000000000 --- a/tests/html/multiparser/unknown/unknow-lang.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - Document - - - - - - - - - - - diff --git a/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap b/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap index aa4df52b8c47..0952db0a8a72 100644 --- a/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap +++ b/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap @@ -164,7 +164,7 @@ printWidth: 80 ================================================================================ `; -exports[`unknow.vue format 1`] = ` +exports[`unknown.vue format 1`] = ` ====================================options===================================== parsers: ["vue"] printWidth: 80 diff --git a/tests/vue/multiparser/unknow.vue b/tests/vue/multiparser/unknow.vue deleted file mode 100644 index 2f01fd114351..000000000000 --- a/tests/vue/multiparser/unknow.vue +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - From e5d325c0b464e160a429479b8dd94920ac4b299b Mon Sep 17 00:00:00 2001 From: fisker Date: Tue, 25 Aug 2020 22:25:00 +0800 Subject: [PATCH 09/11] Update tests --- .../unknown/__snapshots__/jsfmt.spec.js.snap | 42 +++++++++------ .../multiparser/unknown/unknown-lang.html | 34 ++++++++++++ .../__snapshots__/jsfmt.spec.js.snap | 52 ++++++++++++------- tests/vue/multiparser/unknown.vue | 30 +++++++++++ 4 files changed, 122 insertions(+), 36 deletions(-) create mode 100644 tests/html/multiparser/unknown/unknown-lang.html create mode 100644 tests/vue/multiparser/unknown.vue diff --git a/tests/html/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap b/tests/html/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap index e3c02e81857c..160a944843b7 100644 --- a/tests/html/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap +++ b/tests/html/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap @@ -15,23 +15,28 @@ printWidth: 80 @@ -46,23 +51,28 @@ foo diff --git a/tests/html/multiparser/unknown/unknown-lang.html b/tests/html/multiparser/unknown/unknown-lang.html new file mode 100644 index 000000000000..8d1f258f0720 --- /dev/null +++ b/tests/html/multiparser/unknown/unknown-lang.html @@ -0,0 +1,34 @@ + + + + + + Document + + + + + + + + + + + diff --git a/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap b/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap index 0952db0a8a72..bc6119180f26 100644 --- a/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap +++ b/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap @@ -171,54 +171,66 @@ printWidth: 80 | printWidth =====================================input====================================== =====================================output===================================== ================================================================================ diff --git a/tests/vue/multiparser/unknown.vue b/tests/vue/multiparser/unknown.vue new file mode 100644 index 000000000000..86dca0de51c0 --- /dev/null +++ b/tests/vue/multiparser/unknown.vue @@ -0,0 +1,30 @@ + + + + + + + + + From e9ac48a02135a3521e7f45e9833dbb4488b7b8d0 Mon Sep 17 00:00:00 2001 From: fisker Date: Tue, 25 Aug 2020 23:16:41 +0800 Subject: [PATCH 10/11] Add more test --- .../__snapshots__/jsfmt.spec.js.snap | 72 ------ .../unknown/__snapshots__/jsfmt.spec.js.snap | 219 ++++++++++++++++++ tests/vue/multiparser/unknown/jsfmt.spec.js | 3 + .../vue/multiparser/{ => unknown}/unknown.vue | 0 4 files changed, 222 insertions(+), 72 deletions(-) create mode 100644 tests/vue/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap create mode 100644 tests/vue/multiparser/unknown/jsfmt.spec.js rename tests/vue/multiparser/{ => unknown}/unknown.vue (100%) diff --git a/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap b/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap index bc6119180f26..4d1047328e9f 100644 --- a/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap +++ b/tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap @@ -164,78 +164,6 @@ printWidth: 80 ================================================================================ `; -exports[`unknown.vue format 1`] = ` -====================================options===================================== -parsers: ["vue"] -printWidth: 80 - | printWidth -=====================================input====================================== - - - - - - - - - - -=====================================output===================================== - - - - - - - - - - -================================================================================ -`; - exports[`vue-component.vue format 1`] = ` ====================================options===================================== parsers: ["vue"] diff --git a/tests/vue/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap b/tests/vue/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap new file mode 100644 index 000000000000..fad52a02b0bf --- /dev/null +++ b/tests/vue/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap @@ -0,0 +1,219 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`unknown.vue - {"embeddedLanguageFormatting":"off"} format 1`] = ` +====================================options===================================== +embeddedLanguageFormatting: "off" +parsers: ["vue"] +printWidth: 80 + | printWidth +=====================================input====================================== + + + + + + + + + + +=====================================output===================================== + + + + + + + + + + +================================================================================ +`; + +exports[`unknown.vue - {"vueIndentScriptAndStyle":true} format 1`] = ` +====================================options===================================== +parsers: ["vue"] +printWidth: 80 +vueIndentScriptAndStyle: true + | printWidth +=====================================input====================================== + + + + + + + + + + +=====================================output===================================== + + + + + + + + + + +================================================================================ +`; + +exports[`unknown.vue format 1`] = ` +====================================options===================================== +parsers: ["vue"] +printWidth: 80 + | printWidth +=====================================input====================================== + + + + + + + + + + +=====================================output===================================== + + + + + + + + + + +================================================================================ +`; diff --git a/tests/vue/multiparser/unknown/jsfmt.spec.js b/tests/vue/multiparser/unknown/jsfmt.spec.js new file mode 100644 index 000000000000..b208b3146639 --- /dev/null +++ b/tests/vue/multiparser/unknown/jsfmt.spec.js @@ -0,0 +1,3 @@ +run_spec(__dirname, ["vue"]); +run_spec(__dirname, ["vue"], {vueIndentScriptAndStyle: true}); +run_spec(__dirname, ["vue"], {embeddedLanguageFormatting: "off"}); diff --git a/tests/vue/multiparser/unknown.vue b/tests/vue/multiparser/unknown/unknown.vue similarity index 100% rename from tests/vue/multiparser/unknown.vue rename to tests/vue/multiparser/unknown/unknown.vue From ac1c5e5ea0e98b8fcabbb51d4609a97fd0d51b0e Mon Sep 17 00:00:00 2001 From: fisker Date: Tue, 25 Aug 2020 23:20:02 +0800 Subject: [PATCH 11/11] Code style --- tests/vue/multiparser/unknown/jsfmt.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/vue/multiparser/unknown/jsfmt.spec.js b/tests/vue/multiparser/unknown/jsfmt.spec.js index b208b3146639..e188873aa9d8 100644 --- a/tests/vue/multiparser/unknown/jsfmt.spec.js +++ b/tests/vue/multiparser/unknown/jsfmt.spec.js @@ -1,3 +1,3 @@ run_spec(__dirname, ["vue"]); -run_spec(__dirname, ["vue"], {vueIndentScriptAndStyle: true}); -run_spec(__dirname, ["vue"], {embeddedLanguageFormatting: "off"}); +run_spec(__dirname, ["vue"], { vueIndentScriptAndStyle: true }); +run_spec(__dirname, ["vue"], { embeddedLanguageFormatting: "off" });