Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 10 additions & 12 deletions lib/utils/indent-common.js
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,9 @@ module.exports.defineVisitor = function create (context, tokenStore, defaultOpti
ExportAllDeclaration (node) {
const tokens = tokenStore.getTokens(node)
const firstToken = tokens.shift()
if (isSemicolon(last(tokens))) {
tokens.pop()
}
setOffset(tokens, 1, firstToken)
},

Expand Down Expand Up @@ -1445,25 +1448,20 @@ module.exports.defineVisitor = function create (context, tokenStore, defaultOpti

// Process semicolons.
':statement' (node) {
const info = offsets.get(tokenStore.getFirstToken(node))
const firstToken = tokenStore.getFirstToken(node)
const lastToken = tokenStore.getLastToken(node)
if (info == null) {
return
}
if (isSemicolon(lastToken)) {
offsets.set(lastToken, info)
if (isSemicolon(lastToken) && firstToken !== lastToken) {
setOffset(lastToken, 0, firstToken)
}

// Set to the semicolon of the previous token for semicolon-free style.
// E.g.,
// foo
// ;[1,2,3].forEach(f)
const prevToken = tokenStore.getTokenBefore(node)
if (isSemicolon(prevToken)) {
const prevPrevToken = tokenStore.getTokenBefore(prevToken)
if (prevPrevToken == null || prevToken.loc.end.line !== prevPrevToken.loc.start.line) {
offsets.set(prevToken, info)
}
const info = offsets.get(firstToken)
const prevToken = tokenStore.getTokenBefore(firstToken)
if (info != null && isSemicolon(prevToken) && prevToken.loc.end.line === firstToken.loc.start.line) {
offsets.set(prevToken, info)
}
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<script>
export
const a = 0
;
;
export
const
b
Expand Down
12 changes: 12 additions & 0 deletions tests/fixtures/script-indent/issue407.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!--{"options":[4,{"baseIndent":1,"switchCase":2}]}-->
<script>
function test() {
const variable = 0;

if (variable === 0) {
console.info('wrong indentation reported');
}
}

test();
</script>