Skip to content

Fix false positives in html-indent (issue #729) #730

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

Merged
merged 1 commit into from
Dec 29, 2018
Merged

Fix false positives in html-indent (issue #729) #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/utils/indent-common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ module.exports.defineVisitor = function create (context, tokenStore, defaultOpti
if (!PREFORMATTED_ELEMENT_NAMES.includes(node.name)) {
const isTopLevel = node.parent.type !== 'VElement'
const offset = isTopLevel ? options.baseIndent : 1
processNodeList(node.children.filter(isNotEmptyTextNode), node.startTag, node.endTag, offset)
processNodeList(node.children.filter(isNotEmptyTextNode), node.startTag, node.endTag, offset, false)
} else {
const startTagToken = tokenStore.getFirstToken(node)
const endTagToken = node.endTag && tokenStore.getFirstToken(node.endTag)
Expand Down Expand Up @@ -991,7 +991,7 @@ module.exports.defineVisitor = function create (context, tokenStore, defaultOpti
const firstTokenInfo = offsets.get(tokenStore.getFirstToken(node))

for (const token of tokens) {
offsets.set(token, firstTokenInfo)
offsets.set(token, Object.assign({}, firstTokenInfo))
}
},

Expand Down
29 changes: 29 additions & 0 deletions tests/fixtures/html-indent/issue729.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<!--{}-->
<template>
<div>
<div>text
<a/>
</div>
<div>text
text
<a/>
</div>
<div>text
<!-- comment -->
<a/>
</div>
<div>text
<!-- comment -->
</div>
<div><a/>
<a/>
</div>
<div><a/>
<!-- comment -->
<a/>
</div>
<div><a/>
<a/>
</div>
</div>
</template>