Skip to content

Commit

Permalink
HTML: Fix format on style[lang="sass"] (#9051)
Browse files Browse the repository at this point in the history 
Co-authored-by: prettifier[bot] <45367598+prettifier[bot]@users.noreply.github.com>
  • Loading branch information
@fisker
fisker and prettifier[bot] committed Aug 25, 2020
1 parent 073dfd9 commit ee57066
Show file tree
Hide file tree
Showing 23 changed files with 393 additions and 5 deletions.
2 changes: 1 addition & 1 deletion changelog_unreleased/TEMPLATE.md
View file
Expand Up @@ -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.
<!-- Optional description if it makes sense. -->

<!-- prettier-ignore -->
```jsx
Expand Down
21 changes: 21 additions & 0 deletions changelog_unreleased/html/pr-9051.md
View file
@@ -0,0 +1,21 @@
#### Fix format on `style[lang="sass"]` ([#9051](https://github.com/prettier/prettier/pull/9051) by [@fisker](https://github.com/fisker))

<!-- prettier-ignore -->
```jsx
<!-- Input -->
<style lang="sass">
.hero
@include background-centered
</style>

<!-- Prettier stable -->
<style lang="sass">
.hero @include background-centered;
</style>

<!-- Prettier master -->
<style lang="sass">
.hero
@include background-centered
</style>
```
5 changes: 2 additions & 3 deletions src/language-html/utils.js
View file
Expand Up @@ -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";
}

Expand All @@ -421,13 +421,12 @@ function inferScriptParser(node, options) {
}

if (node.name === "style") {
return inferStyleParser(node) || "css";
return inferStyleParser(node);
}

if (options && isVueNonHtmlBlock(node, options)) {
return (
_inferScriptParser(node) ||
inferStyleParser(node) ||
(!("src" in node.attrMap) && getParserName(node.attrMap.lang, options))
);
}
Expand Down
0 ...rser-css/__snapshots__/jsfmt.spec.js.snap → ...rser/css/__snapshots__/jsfmt.spec.js.snap
View file
File renamed without changes.
0 .../multiparser-css/html-with-css-style.html → .../multiparser/css/html-with-css-style.html
View file
File renamed without changes.
0 tests/html/multiparser-css/jsfmt.spec.js → tests/html/multiparser/css/jsfmt.spec.js
View file
File renamed without changes.
0 ...arser-js/__snapshots__/jsfmt.spec.js.snap → ...arser/js/__snapshots__/jsfmt.spec.js.snap
View file
File renamed without changes.
0 ...l/multiparser-js/html-with-js-script.html → ...l/multiparser/js/html-with-js-script.html
View file
File renamed without changes.
0 tests/html/multiparser-js/jsfmt.spec.js → tests/html/multiparser/js/jsfmt.spec.js
View file
File renamed without changes.
0 ...l/multiparser-js/script-tag-escaping.html → ...l/multiparser/js/script-tag-escaping.html
View file
File renamed without changes.
0 ...markdown/__snapshots__/jsfmt.spec.js.snap → ...markdown/__snapshots__/jsfmt.spec.js.snap
View file
File renamed without changes.
0 ...r-markdown/html-with-markdown-script.html → ...r/markdown/html-with-markdown-script.html
View file
File renamed without changes.
0 ...s/html/multiparser-markdown/jsfmt.spec.js → ...s/html/multiparser/markdown/jsfmt.spec.js
View file
File renamed without changes.
0 ...arser-ts/__snapshots__/jsfmt.spec.js.snap → ...arser/ts/__snapshots__/jsfmt.spec.js.snap
View file
File renamed without changes.
0 ...l/multiparser-ts/html-with-ts-script.html → ...l/multiparser/ts/html-with-ts-script.html
View file
File renamed without changes.
0 tests/html/multiparser-ts/jsfmt.spec.js → tests/html/multiparser/ts/jsfmt.spec.js
View file
File renamed without changes.
81 changes: 81 additions & 0 deletions tests/html/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap
View file
@@ -0,0 +1,81 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`unknown-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">
.prettier {
content:
"awesome"
}
</style>
<script lang="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown" lang="unknown">
prettier.is
.awesome(
)
</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">
.prettier {
content:
"awesome"
}
</style>
<script lang="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown" lang="unknown">
prettier.is
.awesome(
)
</script>
</body>
</html>
================================================================================
`;
1 change: 1 addition & 0 deletions tests/html/multiparser/unknown/jsfmt.spec.js
View file
@@ -0,0 +1 @@
run_spec(__dirname, ["html"]);
34 changes: 34 additions & 0 deletions tests/html/multiparser/unknown/unknown-lang.html
View file
@@ -0,0 +1,34 @@
<!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">
.prettier {
content:
"awesome"
}
</style>

<script lang="unknown">
prettier.is
.awesome(
)
</script>

<script type="unknown">
prettier.is
.awesome(
)
</script>

<script type="unknown" lang="unknown">
prettier.is
.awesome(
)
</script>
</body>
</html>
219 changes: 219 additions & 0 deletions tests/vue/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap
View file
@@ -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======================================
<style lang="unknown">
.prettier {
content:
"awesome"
}
</style>
<script lang="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown" lang="unknown">
prettier.is
.awesome(
)
</script>
<template lang="unknown">
<prettier>
awesome
</prettier>
</template>
=====================================output=====================================
<style lang="unknown">
.prettier {
content:
"awesome"
}
</style>
<script lang="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown" lang="unknown">
prettier.is
.awesome(
)
</script>
<template lang="unknown">
<prettier>
awesome
</prettier>
</template>
================================================================================
`;

exports[`unknown.vue - {"vueIndentScriptAndStyle":true} format 1`] = `
====================================options=====================================
parsers: ["vue"]
printWidth: 80
vueIndentScriptAndStyle: true
| printWidth
=====================================input======================================
<style lang="unknown">
.prettier {
content:
"awesome"
}
</style>
<script lang="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown" lang="unknown">
prettier.is
.awesome(
)
</script>
<template lang="unknown">
<prettier>
awesome
</prettier>
</template>
=====================================output=====================================
<style lang="unknown">
.prettier {
content:
"awesome"
}
</style>
<script lang="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown" lang="unknown">
prettier.is
.awesome(
)
</script>
<template lang="unknown">
<prettier>
awesome
</prettier>
</template>
================================================================================
`;

exports[`unknown.vue format 1`] = `
====================================options=====================================
parsers: ["vue"]
printWidth: 80
| printWidth
=====================================input======================================
<style lang="unknown">
.prettier {
content:
"awesome"
}
</style>
<script lang="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown" lang="unknown">
prettier.is
.awesome(
)
</script>
<template lang="unknown">
<prettier>
awesome
</prettier>
</template>
=====================================output=====================================
<style lang="unknown">
.prettier {
content:
"awesome"
}
</style>
<script lang="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown">
prettier.is
.awesome(
)
</script>
<script type="unknown" lang="unknown">
prettier.is
.awesome(
)
</script>
<template lang="unknown">
<prettier>
awesome
</prettier>
</template>
================================================================================
`;
3 changes: 3 additions & 0 deletions tests/vue/multiparser/unknown/jsfmt.spec.js
View file
@@ -0,0 +1,3 @@
run_spec(__dirname, ["vue"]);
run_spec(__dirname, ["vue"], { vueIndentScriptAndStyle: true });
run_spec(__dirname, ["vue"], { embeddedLanguageFormatting: "off" });

0 comments on commit ee57066

Please sign in to comment.