Commit 0e51839

mysticateamichalsnik

authored and

committed

Fix: make strict for flatten ternary expr (fixes #625) (#675)

1 parent 1ef1d33 commit 0e51839Copy full SHA for 0e51839

File tree

+17

-1

lines changed

+17

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -984,12 +984,16 @@ module.exports.defineVisitor = function create (context, tokenStore, defaultOpti`
`984`	`984`	`},`
`985`	`985`
`986`	`986`	`ConditionalExpression (node) {`
	`987`	`+ const prevToken = tokenStore.getTokenBefore(node)`
`987`	`988`	`const firstToken = tokenStore.getFirstToken(node)`
`988`	`989`	`const questionToken = tokenStore.getTokenAfter(node.test, isNotRightParen)`
`989`	`990`	`const consequentToken = tokenStore.getTokenAfter(questionToken)`
`990`	`991`	`const colonToken = tokenStore.getTokenAfter(node.consequent, isNotRightParen)`
`991`	`992`	`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`
`993`	`997`
`994`	`998`	`if (isFlat) {`
`995`	`999`	`setOffset([questionToken, consequentToken, colonToken, alternateToken], 0, firstToken)`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff 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>`

Comments

(0)