fix(compiler-sfc): expose correct range for empty blocks

This commit is contained in:
Evan You 2021-07-19 17:05:37 -04:00
parent d810a1a569
commit b274b08f5f
2 changed files with 27 additions and 1 deletions

View File

@ -111,10 +111,26 @@ h1 { color: red }
) )
}) })
test('should keep template nodes with no content', () => { test('should parse correct range for blocks with no content (self closing)', () => {
const { descriptor } = parse(`<template/>`) const { descriptor } = parse(`<template/>`)
expect(descriptor.template).toBeTruthy() expect(descriptor.template).toBeTruthy()
expect(descriptor.template!.content).toBeFalsy() expect(descriptor.template!.content).toBeFalsy()
expect(descriptor.template!.loc).toMatchObject({
start: { line: 1, column: 1, offset: 0 },
end: { line: 1, column: 1, offset: 0 },
source: ''
})
})
test('should parse correct range for blocks with no content (explicit)', () => {
const { descriptor } = parse(`<template></template>`)
expect(descriptor.template).toBeTruthy()
expect(descriptor.template!.content).toBeFalsy()
expect(descriptor.template!.loc).toMatchObject({
start: { line: 1, column: 11, offset: 10 },
end: { line: 1, column: 11, offset: 10 },
source: ''
})
}) })
test('should ignore other nodes with no content', () => { test('should ignore other nodes with no content', () => {

View File

@ -305,6 +305,16 @@ function createBlock(
start = node.children[0].loc.start start = node.children[0].loc.start
end = node.children[node.children.length - 1].loc.end end = node.children[node.children.length - 1].loc.end
content = source.slice(start.offset, end.offset) content = source.slice(start.offset, end.offset)
} else {
const offset = node.loc.source.indexOf(`</`)
if (offset > -1) {
start = {
line: start.line,
column: start.column + offset,
offset: start.offset + offset
}
}
end = { ...start }
} }
const loc = { const loc = {
source: content, source: content,