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

Vue: fix format on blocks with src attribute #9052

Merged
merged 4 commits into from Aug 25, 2020
Merged

Vue: fix format on blocks with src attribute #9052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f31b939
Add failed tests
fisker Aug 25, 2020
d594b4a
Fix format
fisker Aug 25, 2020
09c8514
Add changlog
fisker Aug 25, 2020
21187d5
Use `in`
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
20 changes: 20 additions & 0 deletions changelog_unreleased/vue/pr-9052.md
View file
Open in desktop
@@ -0,0 +1,20 @@
#### Fix format blocks with `src` attribute ([#9052](https://github.com/prettier/prettier/pull/9052) by [@fisker](https://github.com/fisker))

<!-- prettier-ignore -->
```vue
<!-- Input -->
<custom lang="markdown" src="./foo.md"></custom>
<custom lang="markdown" src="./foo.md" />

<!-- Prettier stable -->
<custom lang="markdown" src="./foo.md">

</custom>
<custom lang="markdown" src="./foo.md"

/>

<!-- Prettier master -->
<custom lang="markdown" src="./foo.md"></custom>
<custom lang="markdown" src="./foo.md" />
```
2 changes: 1 addition & 1 deletion src/language-html/utils.js
View file
Open in desktop
Expand Up @@ -428,7 +428,7 @@ function inferScriptParser(node, options) {
return (
_inferScriptParser(node) ||
inferStyleParser(node) ||
getParserName(node.attrMap.lang, options)
(!("src" in node.attrMap) && getParserName(node.attrMap.lang, options))
);
}
}
Expand Down
143 changes: 143 additions & 0 deletions tests/vue/with-plugins/__snapshots__/jsfmt.spec.js.snap
View file
Open in desktop
Expand Up @@ -235,3 +235,146 @@ printWidth: 80

================================================================================
`;

exports[`with-src.vue - {"embeddedLanguageFormatting":"off"} format 1`] = `
====================================options=====================================
embeddedLanguageFormatting: "off"
parsers: ["vue"]
printWidth: 80
| printWidth
=====================================input======================================
<template lang="uppercase-rocks" src="foo.uppercase-rocks"></template>
<style lang="uppercase-rocks" src="foo.uppercase-rocks"></style>
<script lang="uppercase-rocks" src="foo.uppercase-rocks"></script>
<custom lang="uppercase-rocks" src="foo.uppercase-rocks"></custom>
<template lang="uppercase-rocks" src></template>
<template lang="uppercase-rocks" src=""></template>
<template lang="uppercase-rocks" src>PrEtTiEr</template>
<template lang="uppercase-rocks" src="">PrEtTiEr</template>
<template lang="uppercase-rocks" src>

</template>
<template lang="uppercase-rocks" src="">

</template>

<template lang="uppercase-rocks" src="foo.uppercase-rocks">
PrEtTiEr
</template>


<template lang="uppercase-rocks" :src="">PrEtTiEr</template>
<template lang="uppercase-rocks" @src="">PrEtTiEr</template>

<template lang="uppercase-rocks" src="foo.uppercase-rocks"/>
<style lang="uppercase-rocks" src="foo.uppercase-rocks"/>
<script lang="uppercase-rocks" src="foo.uppercase-rocks"/>
<custom lang="uppercase-rocks" src="foo.uppercase-rocks"/>
<custom lang="uppercase-rocks" src/>
<template lang="uppercase-rocks" src=""/>

=====================================output=====================================
<template lang="uppercase-rocks" src="foo.uppercase-rocks"></template>
<style lang="uppercase-rocks" src="foo.uppercase-rocks"></style>
<script lang="uppercase-rocks" src="foo.uppercase-rocks"></script>
<custom lang="uppercase-rocks" src="foo.uppercase-rocks"></custom>
<template lang="uppercase-rocks" src></template>
<template lang="uppercase-rocks" src=""></template>
<template lang="uppercase-rocks" src>PrEtTiEr</template>
<template lang="uppercase-rocks" src="">PrEtTiEr</template>
<template lang="uppercase-rocks" src>

</template>
<template lang="uppercase-rocks" src="">

</template>

<template lang="uppercase-rocks" src="foo.uppercase-rocks">
PrEtTiEr
</template>

<template lang="uppercase-rocks" :src="">PrEtTiEr</template>
<template lang="uppercase-rocks" @src="">PrEtTiEr</template>

<template lang="uppercase-rocks" src="foo.uppercase-rocks" />
<style lang="uppercase-rocks" src="foo.uppercase-rocks" />
<script lang="uppercase-rocks" src="foo.uppercase-rocks" />
<custom lang="uppercase-rocks" src="foo.uppercase-rocks" />
<custom lang="uppercase-rocks" src />
<template lang="uppercase-rocks" src="" />

================================================================================
`;

exports[`with-src.vue format 1`] = `
====================================options=====================================
parsers: ["vue"]
printWidth: 80
| printWidth
=====================================input======================================
<template lang="uppercase-rocks" src="foo.uppercase-rocks"></template>
<style lang="uppercase-rocks" src="foo.uppercase-rocks"></style>
<script lang="uppercase-rocks" src="foo.uppercase-rocks"></script>
<custom lang="uppercase-rocks" src="foo.uppercase-rocks"></custom>
<template lang="uppercase-rocks" src></template>
<template lang="uppercase-rocks" src=""></template>
<template lang="uppercase-rocks" src>PrEtTiEr</template>
<template lang="uppercase-rocks" src="">PrEtTiEr</template>
<template lang="uppercase-rocks" src>

</template>
<template lang="uppercase-rocks" src="">

</template>

<template lang="uppercase-rocks" src="foo.uppercase-rocks">
PrEtTiEr
</template>


<template lang="uppercase-rocks" :src="">PrEtTiEr</template>
<template lang="uppercase-rocks" @src="">PrEtTiEr</template>

<template lang="uppercase-rocks" src="foo.uppercase-rocks"/>
<style lang="uppercase-rocks" src="foo.uppercase-rocks"/>
<script lang="uppercase-rocks" src="foo.uppercase-rocks"/>
<custom lang="uppercase-rocks" src="foo.uppercase-rocks"/>
<custom lang="uppercase-rocks" src/>
<template lang="uppercase-rocks" src=""/>

=====================================output=====================================
<template lang="uppercase-rocks" src="foo.uppercase-rocks"></template>
<style lang="uppercase-rocks" src="foo.uppercase-rocks"></style>
<script lang="uppercase-rocks" src="foo.uppercase-rocks"></script>
<custom lang="uppercase-rocks" src="foo.uppercase-rocks"></custom>
<template lang="uppercase-rocks" src></template>
<template lang="uppercase-rocks" src=""></template>
<template lang="uppercase-rocks" src>PrEtTiEr</template>
<template lang="uppercase-rocks" src="">PrEtTiEr</template>
<template lang="uppercase-rocks" src>

</template>
<template lang="uppercase-rocks" src="">

</template>

<template lang="uppercase-rocks" src="foo.uppercase-rocks">
PrEtTiEr
</template>

<template lang="uppercase-rocks" :src="">
PRETTIER
</template>
<template lang="uppercase-rocks" @src="">
PRETTIER
</template>

<template lang="uppercase-rocks" src="foo.uppercase-rocks" />
<style lang="uppercase-rocks" src="foo.uppercase-rocks" />
<script lang="uppercase-rocks" src="foo.uppercase-rocks" />
<custom lang="uppercase-rocks" src="foo.uppercase-rocks" />
<custom lang="uppercase-rocks" src />
<template lang="uppercase-rocks" src="" />

================================================================================
`;
29 changes: 29 additions & 0 deletions tests/vue/with-plugins/with-src.vue
View file
Open in desktop
@@ -0,0 +1,29 @@
<template lang="uppercase-rocks" src="foo.uppercase-rocks"></template>
<style lang="uppercase-rocks" src="foo.uppercase-rocks"></style>
<script lang="uppercase-rocks" src="foo.uppercase-rocks"></script>
<custom lang="uppercase-rocks" src="foo.uppercase-rocks"></custom>
<template lang="uppercase-rocks" src></template>
<template lang="uppercase-rocks" src=""></template>
<template lang="uppercase-rocks" src>PrEtTiEr</template>
<template lang="uppercase-rocks" src="">PrEtTiEr</template>
<template lang="uppercase-rocks" src>

</template>
<template lang="uppercase-rocks" src="">

</template>

<template lang="uppercase-rocks" src="foo.uppercase-rocks">
PrEtTiEr
</template>


<template lang="uppercase-rocks" :src="">PrEtTiEr</template>
<template lang="uppercase-rocks" @src="">PrEtTiEr</template>

<template lang="uppercase-rocks" src="foo.uppercase-rocks"/>
<style lang="uppercase-rocks" src="foo.uppercase-rocks"/>
<script lang="uppercase-rocks" src="foo.uppercase-rocks"/>
<custom lang="uppercase-rocks" src="foo.uppercase-rocks"/>
<custom lang="uppercase-rocks" src/>
<template lang="uppercase-rocks" src=""/>