HTML: Fix format on style[lang="sass"]

prettier · Aug 25, 2020 · 05d0d72 · 05d0d72
1 parent 9550428
commit 05d0d72
Show file tree

Hide file tree

Showing 19 changed files with 187 additions and 2 deletions.
diff --git 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/...rser-css/__snapshots__/jsfmt.spec.js.snap → ...rser/css/__snapshots__/jsfmt.spec.js.snap b/...rser-css/__snapshots__/jsfmt.spec.js.snap → ...rser/css/__snapshots__/jsfmt.spec.js.snap
diff --git a/.../multiparser-css/html-with-css-style.html → .../multiparser/css/html-with-css-style.html b/.../multiparser-css/html-with-css-style.html → .../multiparser/css/html-with-css-style.html
diff --git a/tests/html/multiparser-css/jsfmt.spec.js → tests/html/multiparser/css/jsfmt.spec.js b/tests/html/multiparser-css/jsfmt.spec.js → tests/html/multiparser/css/jsfmt.spec.js
diff --git a/...arser-js/__snapshots__/jsfmt.spec.js.snap → ...arser/js/__snapshots__/jsfmt.spec.js.snap b/...arser-js/__snapshots__/jsfmt.spec.js.snap → ...arser/js/__snapshots__/jsfmt.spec.js.snap
diff --git a/...l/multiparser-js/html-with-js-script.html → ...l/multiparser/js/html-with-js-script.html b/...l/multiparser-js/html-with-js-script.html → ...l/multiparser/js/html-with-js-script.html
diff --git a/tests/html/multiparser-js/jsfmt.spec.js → tests/html/multiparser/js/jsfmt.spec.js b/tests/html/multiparser-js/jsfmt.spec.js → tests/html/multiparser/js/jsfmt.spec.js
diff --git a/...l/multiparser-js/script-tag-escaping.html → ...l/multiparser/js/script-tag-escaping.html b/...l/multiparser-js/script-tag-escaping.html → ...l/multiparser/js/script-tag-escaping.html
diff --git a/...markdown/__snapshots__/jsfmt.spec.js.snap → ...markdown/__snapshots__/jsfmt.spec.js.snap b/...markdown/__snapshots__/jsfmt.spec.js.snap → ...markdown/__snapshots__/jsfmt.spec.js.snap
diff --git a/...r-markdown/html-with-markdown-script.html → ...r/markdown/html-with-markdown-script.html b/...r-markdown/html-with-markdown-script.html → ...r/markdown/html-with-markdown-script.html
diff --git a/...s/html/multiparser-markdown/jsfmt.spec.js → ...s/html/multiparser/markdown/jsfmt.spec.js b/...s/html/multiparser-markdown/jsfmt.spec.js → ...s/html/multiparser/markdown/jsfmt.spec.js
diff --git a/...arser-ts/__snapshots__/jsfmt.spec.js.snap → ...arser/ts/__snapshots__/jsfmt.spec.js.snap b/...arser-ts/__snapshots__/jsfmt.spec.js.snap → ...arser/ts/__snapshots__/jsfmt.spec.js.snap
diff --git a/...l/multiparser-ts/html-with-ts-script.html → ...l/multiparser/ts/html-with-ts-script.html b/...l/multiparser-ts/html-with-ts-script.html → ...l/multiparser/ts/html-with-ts-script.html
diff --git a/tests/html/multiparser-ts/jsfmt.spec.js → tests/html/multiparser/ts/jsfmt.spec.js b/tests/html/multiparser-ts/jsfmt.spec.js → 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
@@ -0,0 +1,71 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`unknow-lang.html format 1`] = `
+====================================options=====================================
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Document</title>
+</head>
+<body>
+  <style lang="unknown">
+foo
+       bar
+</style>
+
+<script lang="unknown">
+foo
+       bar
+</script>
+
+<script type="unknown">
+foo
+       bar
+</script>
+
+<script type="unknown" lang="unknown">
+foo
+       bar
+</script>
+</body>
+</html>
+
+=====================================output=====================================
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Document</title>
+  </head>
+  <body>
+    <style lang="unknown">
+      foo
+             bar
+    </style>
+
+    <script lang="unknown">
+      foo
+             bar
+    </script>
+
+    <script type="unknown">
+      foo
+             bar
+    </script>
+
+    <script type="unknown" lang="unknown">
+      foo
+             bar
+    </script>
+  </body>
+</html>
+
+================================================================================
+`;
diff --git a/tests/html/multiparser/unknown/jsfmt.spec.js 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
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Document</title>
+</head>
+<body>
+  <style lang="unknown">
+foo
+       bar
+</style>
+
+<script lang="unknown">
+foo
+       bar
+</script>
+
+<script type="unknown">
+foo
+       bar
+</script>
+
+<script type="unknown" lang="unknown">
+foo
+       bar
+</script>
+</body>
+</html>
diff --git 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======================================
+<style lang="unknown">
+    foo
+          bar
+</style>
+
+<script lang="unknown">
+      foo
+            bar
+</script>
+
+<script type="unknown">
+      foo
+            bar
+</script>
+
+<script type="unknown" lang="unknown">
+    foo
+          bar
+</script>
+
+<template lang="unknown">
+    foo
+          bar
+</template>
+
+=====================================output=====================================
+<style lang="unknown">
+foo
+      bar
+</style>
+
+<script lang="unknown">
+foo
+      bar
+</script>
+
+<script type="unknown">
+foo
+      bar
+</script>
+
+<script type="unknown" lang="unknown">
+foo
+      bar
+</script>
+
+<template lang="unknown">
+    foo
+          bar
+</template>
+
+================================================================================
+`;
+
 exports[`vue-component.vue format 1`] = `
 ====================================options=====================================
 parsers: ["vue"]

diff --git a/tests/vue/multiparser/unknow.vue b/tests/vue/multiparser/unknow.vue
@@ -0,0 +1,24 @@
+<style lang="unknown">
+    foo
+          bar
+</style>
+
+<script lang="unknown">
+      foo
+            bar
+</script>
+
+<script type="unknown">
+      foo
+            bar
+</script>
+
+<script type="unknown" lang="unknown">
+    foo
+          bar
+</script>
+
+<template lang="unknown">
+    foo
+          bar
+</template>