Skip to content

Commit 3411403

Browse files
ota-meshiota-meshi
committed
Make the indent rules supports ECMAScript 2020
1 parent 99fe70d commit 3411403

27 files changed

+285
-10
lines changed

‎docs/rules/html-indent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ description: enforce consistent indentation in `<template>`
1515
This rule enforces a consistent indentation style in `<template>`. The default style is 2 spaces.
1616

1717
- This rule checks all tags, also all expressions in directives and mustaches.
18-
- In the expressions, this rule supports ECMAScript 2017 syntaxes. It ignores unknown AST nodes, but it might be confused by non-standard syntaxes.
18+
- In the expressions, this rule supports ECMAScript 2020 syntaxes. It ignores unknown AST nodes, but it might be confused by non-standard syntaxes.
1919

2020
<eslint-code-block fix :rules="{'vue/html-indent': ['error']}">
2121

‎lib/utils/indent-common.js

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const assert = require('assert')
1414
// Helpers
1515
// ------------------------------------------------------------------------------
1616

17-
const KNOWN_NODES = new Set(['ArrayExpression', 'ArrayPattern', 'ArrowFunctionExpression', 'AssignmentExpression', 'AssignmentPattern', 'AwaitExpression', 'BinaryExpression', 'BlockStatement', 'BreakStatement', 'CallExpression', 'CatchClause', 'ClassBody', 'ClassDeclaration', 'ClassExpression', 'ConditionalExpression', 'ContinueStatement', 'DebuggerStatement', 'DoWhileStatement', 'EmptyStatement', 'ExperimentalRestProperty', 'ExperimentalSpreadProperty', 'ExportAllDeclaration', 'ExportDefaultDeclaration', 'ExportNamedDeclaration', 'ExportSpecifier', 'ExpressionStatement', 'ForInStatement', 'ForOfStatement', 'ForStatement', 'FunctionDeclaration', 'FunctionExpression', 'Identifier', 'IfStatement', 'ImportDeclaration', 'ImportDefaultSpecifier', 'ImportNamespaceSpecifier', 'ImportSpecifier', 'LabeledStatement', 'Literal', 'LogicalExpression', 'MemberExpression', 'MetaProperty', 'MethodDefinition', 'NewExpression', 'ObjectExpression', 'ObjectPattern', 'Program', 'Property', 'RestElement', 'ReturnStatement', 'SequenceExpression', 'SpreadElement', 'Super', 'SwitchCase', 'SwitchStatement', 'TaggedTemplateExpression', 'TemplateElement', 'TemplateLiteral', 'ThisExpression', 'ThrowStatement', 'TryStatement', 'UnaryExpression', 'UpdateExpression', 'VariableDeclaration', 'VariableDeclarator', 'WhileStatement', 'WithStatement', 'YieldExpression', 'VAttribute', 'VDirectiveKey', 'VDocumentFragment', 'VElement', 'VEndTag', 'VExpressionContainer', 'VFilter', 'VFilterSequenceExpression', 'VForExpression', 'VIdentifier', 'VLiteral', 'VOnExpression', 'VSlotScopeExpression', 'VStartTag', 'VText'])
17+
const KNOWN_NODES = new Set(['ArrayExpression', 'ArrayPattern', 'ArrowFunctionExpression', 'AssignmentExpression', 'AssignmentPattern', 'AwaitExpression', 'BinaryExpression', 'BlockStatement', 'BreakStatement', 'CallExpression', 'CatchClause', 'ClassBody', 'ClassDeclaration', 'ClassExpression', 'ConditionalExpression', 'ContinueStatement', 'DebuggerStatement', 'DoWhileStatement', 'EmptyStatement', 'ExperimentalRestProperty', 'ExperimentalSpreadProperty', 'ExportAllDeclaration', 'ExportDefaultDeclaration', 'ExportNamedDeclaration', 'ExportSpecifier', 'ExpressionStatement', 'ForInStatement', 'ForOfStatement', 'ForStatement', 'FunctionDeclaration', 'FunctionExpression', 'Identifier', 'IfStatement', 'ImportDeclaration', 'ImportDefaultSpecifier', 'ImportExpression', 'ImportNamespaceSpecifier', 'ImportSpecifier', 'LabeledStatement', 'Literal', 'LogicalExpression', 'MemberExpression', 'MetaProperty', 'MethodDefinition', 'NewExpression', 'ObjectExpression', 'ObjectPattern', 'OptionalCallExpression', 'OptionalMemberExpression', 'Program', 'Property', 'RestElement', 'ReturnStatement', 'SequenceExpression', 'SpreadElement', 'Super', 'SwitchCase', 'SwitchStatement', 'TaggedTemplateExpression', 'TemplateElement', 'TemplateLiteral', 'ThisExpression', 'ThrowStatement', 'TryStatement', 'UnaryExpression', 'UpdateExpression', 'VariableDeclaration', 'VariableDeclarator', 'WhileStatement', 'WithStatement', 'YieldExpression', 'VAttribute', 'VDirectiveKey', 'VDocumentFragment', 'VElement', 'VEndTag', 'VExpressionContainer', 'VFilter', 'VFilterSequenceExpression', 'VForExpression', 'VIdentifier', 'VLiteral', 'VOnExpression', 'VSlotScopeExpression', 'VStartTag', 'VText'])
1818
const LT_CHAR = /[\r\n\u2028\u2029]/
1919
const LINES = /[^\r\n\u2028\u2029]+(?:$|\r\n|[\r\n\u2028\u2029])/g
2020
const BLOCK_COMMENT_PREFIX = /^\s*\*/
@@ -539,7 +539,7 @@ module.exports.defineVisitor = function create (context, tokenStore, defaultOpti
539539
if (t === 'VExpressionContainer') {
540540
return node.range[0] === token.range[0]
541541
}
542-
if (t === 'CallExpression' || t === 'NewExpression') {
542+
if (t === 'CallExpression' || t === 'NewExpression' || t === 'OptionalCallExpression') {
543543
const openParen = tokenStore.getTokenAfter(parent.callee, isNotRightParen)
544544
return parent.arguments.some(param =>
545545
getFirstAndLastTokens(param, openParen.range[1]).firstToken.range[0] === token.range[0]
@@ -1051,7 +1051,7 @@ module.exports.defineVisitor = function create (context, tokenStore, defaultOpti
10511051
}
10521052
},
10531053

1054-
CallExpression (node) {
1054+
'CallExpression, OptionalCallExpression' (node) {
10551055
const firstToken = tokenStore.getFirstToken(node)
10561056
const rightToken = tokenStore.getLastToken(node)
10571057
const leftToken = tokenStore.getTokenAfter(node.callee, isLeftParen)
@@ -1060,6 +1060,15 @@ module.exports.defineVisitor = function create (context, tokenStore, defaultOpti
10601060
processNodeList(node.arguments, leftToken, rightToken, 1)
10611061
},
10621062

1063+
ImportExpression (node) {
1064+
const firstToken = tokenStore.getFirstToken(node)
1065+
const rightToken = tokenStore.getLastToken(node)
1066+
const leftToken = tokenStore.getTokenAfter(firstToken, isLeftParen)
1067+
1068+
setOffset(leftToken, 1, firstToken)
1069+
processNodeList([node.source], leftToken, rightToken, 1)
1070+
},
1071+
10631072
CatchClause (node) {
10641073
const firstToken = tokenStore.getFirstToken(node)
10651074
const bodyToken = tokenStore.getFirstToken(node.body)
@@ -1171,12 +1180,16 @@ module.exports.defineVisitor = function create (context, tokenStore, defaultOpti
11711180

11721181
'ForInStatement, ForOfStatement' (node) {
11731182
const forToken = tokenStore.getFirstToken(node)
1174-
const leftParenToken = tokenStore.getTokenAfter(forToken)
1183+
const awaitToken = (node.await && tokenStore.getTokenAfter(forToken)) || null
1184+
const leftParenToken = tokenStore.getTokenAfter(awaitToken || forToken)
11751185
const leftToken = tokenStore.getTokenAfter(leftParenToken)
11761186
const inToken = tokenStore.getTokenAfter(leftToken, isNotRightParen)
11771187
const rightToken = tokenStore.getTokenAfter(inToken)
11781188
const rightParenToken = tokenStore.getTokenBefore(node.body, isNotLeftParen)
11791189

1190+
if (awaitToken != null) {
1191+
setOffset(awaitToken, 0, forToken)
1192+
}
11801193
setOffset(leftParenToken, 1, forToken)
11811194
setOffset(leftToken, 1, leftParenToken)
11821195
setOffset(inToken, 1, leftToken)
@@ -1353,7 +1366,7 @@ module.exports.defineVisitor = function create (context, tokenStore, defaultOpti
13531366
setOffset([colonToken, bodyToken], 1, labelToken)
13541367
},
13551368

1356-
'MemberExpression, MetaProperty' (node) {
1369+
'MemberExpression, MetaProperty, OptionalMemberExpression' (node) {
13571370
const objectToken = tokenStore.getFirstToken(node)
13581371
if (node.computed) {
13591372
const leftBracketToken = tokenStore.getTokenBefore(node.property, isLeftBracket)

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
},
5151
"devDependencies": {
5252
"@types/node": "^4.2.16",
53-
"@typescript-eslint/parser": "^2.6.1",
53+
"@typescript-eslint/parser": "^2.13.0",
5454
"acorn": "^7.1.0",
5555
"babel-eslint": "^10.0.2",
5656
"chai": "^4.1.0",
@@ -64,7 +64,7 @@
6464
"mocha": "^5.2.0",
6565
"nyc": "^12.0.2",
6666
"semver": "^5.6.0",
67-
"typescript": "^3.5.2",
67+
"typescript": "^3.7.4",
6868
"vue-eslint-editor": "^0.1.4",
6969
"vuepress": "^0.14.5"
7070
}

‎tests/fixtures/html-indent/nullish-coalescing-operator-01.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<!--{"parserOptions": {"parser":"@typescript-eslint/parser"}}-->
2+
<!-- TODO If ESLint supports the new syntax by default, remove the parser specification and test. -->
3+
<template>
4+
<div v-bind:a="a
5+
??
6+
b
7+
"/>
8+
</template>

‎tests/fixtures/html-indent/optional-chaining-01.vue

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!--{"parserOptions": {"parser":"@typescript-eslint/parser"}}-->
2+
<!-- TODO If ESLint supports the new syntax by default, remove the parser specification and test. -->
3+
4+
<template>
5+
<div v-bind:a="
6+
obj
7+
?.aaa
8+
?.bbb
9+
?.ccc
10+
"/>
11+
</template>

‎tests/fixtures/html-indent/optional-chaining-02.vue

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<!--{"parserOptions": {"parser":"@typescript-eslint/parser"}}-->
2+
<!-- TODO If ESLint supports the new syntax by default, remove the parser specification and test. -->
3+
<template>
4+
<div v-bind:a="
5+
obj?.
6+
aaa?.
7+
bbb?.
8+
ccc
9+
"/>
10+
</template>

‎tests/fixtures/html-indent/optional-chaining-03.vue

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<!--{"parserOptions": {"parser":"@typescript-eslint/parser"}}-->
2+
<!-- TODO If ESLint supports the new syntax by default, remove the parser specification and test. -->
3+
<template>
4+
<div v-bind:a="
5+
obj?.
6+
[aaa]?.
7+
[bbb]
8+
?.[ccc]
9+
"/>
10+
</template>

‎tests/fixtures/html-indent/optional-chaining-04.vue

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!--{"parserOptions": {"parser":"@typescript-eslint/parser"}}-->
2+
<!-- TODO If ESLint supports the new syntax by default, remove the parser specification and test. -->
3+
<template>
4+
<div v-bind:a="
5+
obj?.
6+
(
7+
aaa
8+
)?.
9+
(
10+
bbb
11+
)
12+
?.(
13+
ccc
14+
)
15+
"/>
16+
</template>

‎tests/fixtures/script-indent/bigint-01.vue

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!--{}-->
2+
<script>
3+
var a =
4+
10n
5+
+
6+
5n
7+
</script>

‎tests/fixtures/script-indent/for-await-of-01.vue

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!--{}-->
2+
<script>
3+
async function fn() {
4+
for
5+
await
6+
(
7+
a
8+
of
9+
b
10+
)
11+
{
12+
;
13+
}
14+
}
15+
</script>

‎tests/fixtures/script-indent/import-expression-01.vue

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!--{}-->
2+
<script>
3+
const fs = import
4+
(
5+
'fs'
6+
)
7+
</script>

‎tests/fixtures/script-indent/import-expression-02.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<!--{}-->
2+
<script>
3+
const module = import
4+
(
5+
m.
6+
n
7+
)
8+
</script>

‎tests/fixtures/script-indent/import-expression-03.vue

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!--{}-->
2+
<script>
3+
async function fn() {
4+
return await
5+
import
6+
(
7+
m.
8+
n
9+
)
10+
}
11+
</script>

‎tests/fixtures/script-indent/nullish-coalescing-operator-01.vue

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!--{"parserOptions": {"parser":"@typescript-eslint/parser"}}-->
2+
<!-- TODO If ESLint supports the new syntax by default, remove the parser specification and test. -->
3+
<script>
4+
var v = a
5+
??
6+
b
7+
</script>

‎tests/fixtures/script-indent/nullish-coalescing-operator-babel-01.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<!--{"parserOptions": {"parser":"babel-eslint"}}-->
2+
<script>
3+
var v = a
4+
??
5+
b
6+
</script>

‎tests/fixtures/script-indent/nullish-coalescing-operator-ts-01.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<!--{"parserOptions": {"parser":"@typescript-eslint/parser"}}-->
2+
<script>
3+
var v = a
4+
??
5+
b
6+
</script>

‎tests/fixtures/script-indent/object-expression-04.vue

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!--{}-->
2+
<script>
3+
var obj = {
4+
a:
5+
1,
6+
...obj1,
7+
b:
8+
2,
9+
...
10+
obj2,
11+
}
12+
</script>

‎tests/fixtures/script-indent/optional-chaining-01.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<!--{"parserOptions": {"parser":"@typescript-eslint/parser"}}-->
2+
<!-- TODO If ESLint supports the new syntax by default, remove the parser specification and test. -->
3+
<script>
4+
obj
5+
?.aaa
6+
?.bbb
7+
?.ccc
8+
</script>

‎tests/fixtures/script-indent/optional-chaining-02.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<!--{"parserOptions": {"parser":"@typescript-eslint/parser"}}-->
2+
<!-- TODO If ESLint supports the new syntax by default, remove the parser specification and test. -->
3+
<script>
4+
obj?.
5+
aaa?.
6+
bbb?.
7+
ccc
8+
</script>

‎tests/fixtures/script-indent/optional-chaining-03.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<!--{"parserOptions": {"parser":"@typescript-eslint/parser"}}-->
2+
<!-- TODO If ESLint supports the new syntax by default, remove the parser specification and test. -->
3+
<script>
4+
obj?.
5+
[aaa]?.
6+
[bbb]
7+
?.[ccc]
8+
</script>

‎tests/fixtures/script-indent/optional-chaining-04.vue

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!--{"parserOptions": {"parser":"@typescript-eslint/parser"}}-->
2+
<!-- TODO If ESLint supports the new syntax by default, remove the parser specification and test. -->
3+
<script>
4+
obj?.
5+
(
6+
aaa
7+
)?.
8+
(
9+
bbb
10+
)
11+
?.(
12+
ccc
13+
)
14+
</script>

‎tests/fixtures/script-indent/optional-chaining-babel-01.vue

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!--{"parserOptions": {"parser":"babel-eslint"}}-->
2+
<script>
3+
obj
4+
?.aaa
5+
?.bbb
6+
?.ccc;
7+
8+
obj?.
9+
aaa?.
10+
bbb?.
11+
ccc;
12+
13+
obj?.
14+
[aaa]?.
15+
[bbb]
16+
?.[ccc];
17+
18+
obj?.
19+
(
20+
aaa
21+
)?.
22+
(
23+
bbb
24+
)
25+
?.(
26+
ccc
27+
)
28+
</script>

‎tests/fixtures/script-indent/optional-chaining-ts-01.vue

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!--{"parserOptions": {"parser":"@typescript-eslint/parser"}}-->
2+
<script>
3+
obj
4+
?.aaa
5+
?.bbb
6+
?.ccc;
7+
8+
obj?.
9+
aaa?.
10+
bbb?.
11+
ccc;
12+
13+
obj?.
14+
[aaa]?.
15+
[bbb]
16+
?.[ccc];
17+
18+
obj?.
19+
(
20+
aaa
21+
)?.
22+
(
23+
bbb
24+
)
25+
?.(
26+
ccc
27+
)
28+
</script>

‎tests/fixtures/script-indent/rest-properties-01.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<!--{}-->
2+
<script>
3+
({
4+
a,
5+
...
6+
b
7+
} = {})
8+
</script>

‎tests/fixtures/script-indent/try-statement-04.vue

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!--{}-->
2+
<script>
3+
try
4+
{
5+
}
6+
catch
7+
{
8+
;
9+
}
10+
finally
11+
{
12+
;
13+
}
14+
</script>

‎tests/lib/rules/html-indent.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ function loadPatterns (additionalValid, additionalInvalid) {
4242
const code0 = fs.readFileSync(path.join(FIXTURE_ROOT, filename), 'utf8')
4343
const code = code0.replace(/^<!--(.+?)-->/, `<!--${filename}-->`)
4444
const baseObj = JSON.parse(/^<!--(.+?)-->/.exec(code0)[1])
45+
if ('parser' in baseObj) {
46+
baseObj.parser = require.resolve(baseObj.parser)
47+
}
48+
if ('parserOptions' in baseObj && 'parser' in baseObj.parserOptions) {
49+
baseObj.parserOptions.parser = require.resolve(baseObj.parserOptions.parser)
50+
}
4551
return Object.assign(baseObj, { code, filename })
4652
})
4753
const invalid = valid
@@ -97,7 +103,7 @@ function unIndent (strings) {
97103
const tester = new RuleTester({
98104
parser: require.resolve('vue-eslint-parser'),
99105
parserOptions: {
100-
ecmaVersion: 2017,
106+
ecmaVersion: 2020,
101107
ecmaFeatures: {
102108
globalReturn: true
103109
}

0 commit comments

Comments
 (0)