Commit 8b8402f

mysticateamichalsnik

authored and

committed

Fix: vue/html-indent ignores <pre> (fixes #365)

1 parent b4413a5 commit 8b8402fCopy full SHA for 8b8402f

File tree

+49

-2

lines changed

+49

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -798,10 +798,12 @@ module.exports.defineVisitor = function create (context, tokenStore, defaultOpti`
`798`	`798`
`799`	`799`	`VElement (node) {`
`800`	`800`	`const startTagToken = tokenStore.getFirstToken(node)`
`801`		`- const childTokens = node.children.map(n => tokenStore.getFirstToken(n))`
`802`	`801`	`const endTagToken = node.endTag && tokenStore.getFirstToken(node.endTag)`
`803`	`802`
`804`		`- setOffset(childTokens, 1, startTagToken)`
	`803`	`+ if (node.name !== 'pre') {`
	`804`	`+ const childTokens = node.children.map(n => tokenStore.getFirstToken(n))`
	`805`	`+ setOffset(childTokens, 1, startTagToken)`
	`806`	`+ }`
`805`	`807`	`setOffset(endTagToken, 0, startTagToken)`
`806`	`808`	`},`
`807`	`809`

Lines changed: 45 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,19 @@ tester.run('html-indent', rule, loadPatterns(`
`230`	`230`	`// Ignore all :D`
`231`	`231`	`ignores: ['*']`
`232`	`232`	`}]`
	`233`	`+ },`
	`234`	`+`
	`235`	`+ // Pre`
	`236`	`+ {`
	`237`	+ code: unIndent`
	`238`	`+ <template>`
	`239`	`+ <pre>`
	`240`	`+ aaa`
	`241`	`+ bbb`
	`242`	`+ ccc`
	`243`	`+ </pre>`
	`244`	`+ </template>`
	`245`	+ `
`233`	`246`	`}`
`234`	`247`	`],`
`235`	`248`
`@@ -480,6 +493,38 @@ tester.run('html-indent', rule, loadPatterns(`
`480`	`493`	`{ message: 'Expected indentation of 12 spaces but found 8 spaces.', line: 4 },`
`481`	`494`	`{ message: 'Expected indentation of 12 spaces but found 8 spaces.', line: 6 }`
`482`	`495`	`]`
	`496`	`+ },`
	`497`	`+`
	`498`	`+ // Pre`
	`499`	`+ {`
	`500`	+ code: unIndent`
	`501`	`+ <template>`
	`502`	`+ <pre`
	`503`	`+ style=""`
	`504`	`+ >`
	`505`	`+ aaa`
	`506`	`+ bbb`
	`507`	`+ ccc`
	`508`	`+ </pre>`
	`509`	`+ </template>`
	`510`	+ `,
	`511`	+ output: unIndent`
	`512`	`+ <template>`
	`513`	`+ <pre`
	`514`	`+ style=""`
	`515`	`+ >`
	`516`	`+ aaa`
	`517`	`+ bbb`
	`518`	`+ ccc`
	`519`	`+ </pre>`
	`520`	`+ </template>`
	`521`	+ `,
	`522`	`+ errors: [`
	`523`	`+ { message: 'Expected indentation of 2 spaces but found 0 spaces.', line: 2 },`
	`524`	`+ { message: 'Expected indentation of 4 spaces but found 0 spaces.', line: 3 },`
	`525`	`+ { message: 'Expected indentation of 2 spaces but found 0 spaces.', line: 4 },`
	`526`	`+ { message: 'Expected indentation of 2 spaces but found 0 spaces.', line: 8 }`
	`527`	`+ ]`
`483`	`528`	`}`
`484`	`529`	`]`
`485`	`530`	`))`

Comments

(0)