Skip to content

Preserve the only whitespace child in pre (fix #4758) #4760

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

Merged
merged 2 commits into from
Jan 20, 2017
Merged

Preserve the only whitespace child in pre (fix #4758) #4760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4623651
preserve the only whitespace child
defcc Jan 20, 2017
35543c7
Merge remote-tracking branch 'originUpstream/dev' into whitespace-in-…
defcc Jan 20, 2017
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
4 changes: 2 additions & 2 deletions src/compiler/parser/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ export function parse (
// remove trailing whitespace
const element = stack[stack.length - 1]
const lastNode = element.children[element.children.length - 1]
if (lastNode && lastNode.type === 3 && lastNode.text === ' ') {
if (lastNode && lastNode.type === 3 && lastNode.text === ' ' && !inPre) {
element.children.pop()
}
// pop stack
Expand Down Expand Up @@ -242,7 +242,7 @@ export function parse (
expression,
text
})
} else if (text !== ' ' || children[children.length - 1].text !== ' ') {
} else if (text !== ' ' || !children.length || children[children.length - 1].text !== ' ') {
currentParent.children.push({
type: 3,
text
Expand Down
6 changes: 5 additions & 1 deletion test/unit/modules/compiler/parser.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,12 +481,16 @@ describe('parser', () => {

it('preserve whitespace in <pre> tag', function () {
const options = extend({}, baseOptions)
const ast = parse('<pre><code> \n<span>hi</span>\n </code></pre>', options)
const ast = parse('<pre><code> \n<span>hi</span>\n </code><span> </span></pre>', options)
const code = ast.children[0]
expect(code.children[0].type).toBe(3)
expect(code.children[0].text).toBe(' \n')
expect(code.children[2].type).toBe(3)
expect(code.children[2].text).toBe('\n ')

const span = ast.children[1]
expect(span.children[0].type).toBe(3)
expect(span.children[0].text).toBe(' ')
})

it('forgivingly handle < in plain text', () => {
Expand Down