Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 12 commits into from Aug 25, 2020
Merged

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

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
481ea90
HTML: Fix format on `style[lang="sass"]`
fisker Aug 25, 2020
b4c262f
Update logic
fisker Aug 25, 2020
100a577
Fix vue custom block parser
fisker Aug 25, 2020
9f79b08
Fix changelog
fisker Aug 25, 2020
0719a03
Simplify logic
fisker Aug 25, 2020
58539a0
Format 0719a03
Aug 25, 2020
5aa8b06
Fix unstableTests path
fisker Aug 25, 2020
665d344
Rename
fisker Aug 25, 2020
e5d325c
Update tests
fisker Aug 25, 2020
daea3f6
Merge branch 'master' into html-infer-parser
fisker Aug 25, 2020
e9ac48a
Add more test
fisker Aug 25, 2020
ac1c5e5
Code style
fisker Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion changelog_unreleased/TEMPLATE.md
View file
Open in desktop
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
Open in desktop
@@ -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>
```
8 changes: 3 additions & 5 deletions src/language-html/utils.js
View file
Open in desktop
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,14 +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) ||
getParserName(node.attrMap.lang, options)
_inferScriptParser(node) || getParserName(node.attrMap.lang, options)
);
}
}
Expand Down
0 ...rser-css/__snapshots__/jsfmt.spec.js.snap → ...rser/css/__snapshots__/jsfmt.spec.js.snap
View file
Open in desktop
File renamed without changes.
0 .../multiparser-css/html-with-css-style.html → .../multiparser/css/html-with-css-style.html
View file
Open in desktop
File renamed without changes.
0 tests/html/multiparser-css/jsfmt.spec.js → tests/html/multiparser/css/jsfmt.spec.js
View file
Open in desktop
File renamed without changes.
0 ...arser-js/__snapshots__/jsfmt.spec.js.snap → ...arser/js/__snapshots__/jsfmt.spec.js.snap
View file
Open in desktop
File renamed without changes.
0 ...l/multiparser-js/html-with-js-script.html → ...l/multiparser/js/html-with-js-script.html
View file
Open in desktop
File renamed without changes.
0 tests/html/multiparser-js/jsfmt.spec.js → tests/html/multiparser/js/jsfmt.spec.js
View file
Open in desktop
File renamed without changes.
0 ...l/multiparser-js/script-tag-escaping.html → ...l/multiparser/js/script-tag-escaping.html
View file
Open in desktop
File renamed without changes.
0 ...markdown/__snapshots__/jsfmt.spec.js.snap → ...markdown/__snapshots__/jsfmt.spec.js.snap
View file
Open in desktop
File renamed without changes.
0 ...r-markdown/html-with-markdown-script.html → ...r/markdown/html-with-markdown-script.html
View file
Open in desktop
File renamed without changes.
0 ...s/html/multiparser-markdown/jsfmt.spec.js → ...s/html/multiparser/markdown/jsfmt.spec.js
View file
Open in desktop
File renamed without changes.
0 ...arser-ts/__snapshots__/jsfmt.spec.js.snap → ...arser/ts/__snapshots__/jsfmt.spec.js.snap
View file
Open in desktop
File renamed without changes.
0 ...l/multiparser-ts/html-with-ts-script.html → ...l/multiparser/ts/html-with-ts-script.html
View file
Open in desktop
File renamed without changes.
0 tests/html/multiparser-ts/jsfmt.spec.js → tests/html/multiparser/ts/jsfmt.spec.js
View file
Open in desktop
File renamed without changes.
71 changes: 71 additions & 0 deletions tests/html/multiparser/unknown/__snapshots__/jsfmt.spec.js.snap
View file
Open in desktop
@@ -0,0 +1,71 @@
// 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">
foo
bar
Copy link
Sponsor Member Author

@fisker fisker Aug 25, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One second, I need change this to valid css, because the parser might still be css and it throws.

</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
fisker marked this conversation as resolved.
Show resolved Hide resolved
</style>

<script lang="unknown">
foo
bar
</script>

<script type="unknown">
foo
bar
</script>

<script type="unknown" lang="unknown">
foo
bar
</script>
</body>
</html>

================================================================================
`;
1 change: 1 addition & 0 deletions tests/html/multiparser/unknown/jsfmt.spec.js
View file
Open in desktop
@@ -0,0 +1 @@
run_spec(__dirname, ["html"]);
60 changes: 60 additions & 0 deletions tests/vue/multiparser/__snapshots__/jsfmt.spec.js.snap
View file
Open in desktop
Expand Up @@ -164,6 +164,66 @@ printWidth: 80
================================================================================
`;

exports[`unknown.vue format 1`] = `
====================================options=====================================
parsers: ["vue"]
printWidth: 80
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add tests for the case --vue-indent-script-and-style is true?

Copy link
Sponsor Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

embeddedLanguageFormatting: "off" vueIndentScriptAndStyle: true tested

| 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"]
Expand Down
2 changes: 1 addition & 1 deletion tests_config/run_spec.js
View file
Open in desktop
Expand Up @@ -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",
Expand Down