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.

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

fix: whitespace: 'condense' should honor <pre> tag as well #9660

Merged
merged 1 commit into from Mar 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/compiler/parser/index.js
Expand Up @@ -351,7 +351,7 @@ export function parse (
text = preserveWhitespace ? ' ' : ''
}
if (text) {
if (whitespaceOption === 'condense') {
if (!inPre && whitespaceOption === 'condense') {
// condense consecutive whitespaces into single space
text = text.replace(whitespaceRE, ' ')
}
Expand Down
49 changes: 44 additions & 5 deletions test/unit/modules/compiler/parser.spec.js
Expand Up @@ -820,12 +820,14 @@ describe('parser', () => {
expect(ast.children[3].children[0].text).toBe('.\n Have fun!\n')
})

const condenseOptions = extend({
whitespace: 'condense',
// should be ignored when whitespace is specified
preserveWhitespace: false
}, baseOptions)

it(`whitespace: 'condense'`, () => {
const options = extend({
whitespace: 'condense',
// should be ignored when whitespace is specified
preserveWhitespace: false
}, baseOptions)
const options = extend({}, condenseOptions)
const ast = parse('<p>\n Welcome to <b>Vue.js</b> <i>world</i> \n <span>.\n Have fun!\n</span></p>', options)
expect(ast.tag).toBe('p')
expect(ast.children.length).toBe(5)
Expand All @@ -842,4 +844,41 @@ describe('parser', () => {
expect(ast.children[4].tag).toBe('span')
expect(ast.children[4].children[0].text).toBe('. Have fun! ')
})

it(`preserve whitespace in <pre> tag with whitespace: 'condense'`, function () {
const options = extend({}, condenseOptions)
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(`ignore the first newline in <pre> tag with whitespace: 'condense'`, function () {
const options = extend({}, condenseOptions)
const ast = parse('<div><pre>\nabc</pre>\ndef<pre>\n\nabc</pre></div>', options)
const pre = ast.children[0]
expect(pre.children[0].type).toBe(3)
expect(pre.children[0].text).toBe('abc')
const text = ast.children[1]
expect(text.type).toBe(3)
expect(text.text).toBe(' def')
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added cases are copied from earlier parts except for this line. The \n part should be collapsed into here.

const pre2 = ast.children[2]
expect(pre2.children[0].type).toBe(3)
expect(pre2.children[0].text).toBe('\nabc')
})

it(`keep first newline after unary tag in <pre> with whitespace: 'condense'`, () => {
const options = extend({}, condenseOptions)
const ast = parse('<pre>abc<input>\ndef</pre>', options)
expect(ast.children[1].type).toBe(1)
expect(ast.children[1].tag).toBe('input')
expect(ast.children[2].type).toBe(3)
expect(ast.children[2].text).toBe('\ndef')
})
})