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

fix(compiler-core): add check when v-else-if is behind v-else #4603

Merged
merged 1 commit into from Sep 21, 2021
Merged

fix(compiler-core): add check when v-else-if is behind v-else #4603

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 16 additions & 1 deletion packages/compiler-core/__tests__/transforms/vIf.spec.ts
View file
Open in desktop
Expand Up @@ -248,7 +248,7 @@ describe('compiler: v-if', () => {
])
})

test('error on v-else-if missing adjacent v-if', () => {
test('error on v-else-if missing adjacent v-if or v-else-if', () => {
const onError = jest.fn()

const { node: node1 } = parseWithIfTransform(`<div v-else-if="foo"/>`, {
Expand Down Expand Up @@ -284,6 +284,21 @@ describe('compiler: v-if', () => {
loc: node3.loc
}
])

const {
node: { branches }
} = parseWithIfTransform(
`<div v-if="notOk"/><div v-else/><div v-else-if="ok"/>`,
{ onError },
0
)

expect(onError.mock.calls[3]).toMatchObject([
{
code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
loc: branches[branches.length - 1].loc
}
])
})

test('error on user key', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/compiler-core/src/errors.ts
View file
Open in desktop
Expand Up @@ -149,7 +149,7 @@ export const errorMessages: Record<ErrorCodes, string> = {
// transform errors
[ErrorCodes.X_V_IF_NO_EXPRESSION]: `v-if/v-else-if is missing expression.`,
[ErrorCodes.X_V_IF_SAME_KEY]: `v-if/else branches must use unique keys.`,
[ErrorCodes.X_V_ELSE_NO_ADJACENT_IF]: `v-else/v-else-if has no adjacent v-if.`,
[ErrorCodes.X_V_ELSE_NO_ADJACENT_IF]: `v-else/v-else-if has no adjacent v-if or v-else-if.`,
[ErrorCodes.X_V_FOR_NO_EXPRESSION]: `v-for is missing expression.`,
[ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION]: `v-for has invalid expression.`,
[ErrorCodes.X_V_FOR_TEMPLATE_KEY_PLACEMENT]: `<template v-for> key should be placed on the <template> tag.`,
Expand Down
10 changes: 10 additions & 0 deletions packages/compiler-core/src/transforms/vIf.ts
View file
Open in desktop
Expand Up @@ -145,6 +145,16 @@ export function processIf(
}

if (sibling && sibling.type === NodeTypes.IF) {
// Check if v-else was followed by v-else-if
if (
dir.name === 'else-if' &&
sibling.branches[sibling.branches.length - 1].condition === undefined
) {
context.onError(
createCompilerError(ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, node.loc)
)
}

// move the node to the if node's branches
context.removeNode()
const branch = createIfBranch(node, dir)
Expand Down