Skip to content

Commit 0e51839

Browse files
mysticateamichalsnik
authored andcommitted
Fix: make strict for flatten ternary expr (fixes #625) (#675)
1 parent 1ef1d33 commit 0e51839

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

lib/utils/indent-common.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -984,12 +984,16 @@ module.exports.defineVisitor = function create (context, tokenStore, defaultOpti
984984
},
985985

986986
ConditionalExpression (node) {
987+
const prevToken = tokenStore.getTokenBefore(node)
987988
const firstToken = tokenStore.getFirstToken(node)
988989
const questionToken = tokenStore.getTokenAfter(node.test, isNotRightParen)
989990
const consequentToken = tokenStore.getTokenAfter(questionToken)
990991
const colonToken = tokenStore.getTokenAfter(node.consequent, isNotRightParen)
991992
const alternateToken = tokenStore.getTokenAfter(colonToken)
992-
const isFlat = (node.test.loc.end.line === node.consequent.loc.start.line)
993+
const isFlat =
994+
prevToken &&
995+
prevToken.loc.end.line !== node.loc.start.line &&
996+
node.test.loc.end.line === node.consequent.loc.start.line
993997

994998
if (isFlat) {
995999
setOffset([questionToken, consequentToken, colonToken, alternateToken], 0, firstToken)
+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!--{}-->
2+
<script>
3+
export default {
4+
data() {
5+
const hours = new Date().getHours();
6+
return {
7+
imgUrl: hours > 21 && hours < 6 ? 'night.png' :
8+
'day.png',
9+
};
10+
},
11+
}
12+
</script>

0 commit comments

Comments
 (0)