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====================================== + + +
+ + +