From 05d0d72a08c31d3ce2d8998a28b8a8259a7f0eef Mon Sep 17 00:00:00 2001 From: fisker Date: Tue, 25 Aug 2020 18:05:17 +0800 Subject: [PATCH] HTML: Fix format on `style[lang="sass"]` --- 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 +++++++ 19 files changed, 187 insertions(+), 2 deletions(-) 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/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 @@ + + + + + + + + +