Skip to content

Commit 58e2197

Browse files
authored
fix(vue/script-indent): false positives for TSImportType (#2969)
1 parent 3991e41 commit 58e2197

File tree

3 files changed

+22
-6
lines changed

3 files changed

+22
-6
lines changed

.changeset/rich-bags-turn.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"eslint-plugin-vue": patch
3+
---
4+
5+
Fixed false positives for `TSImportType` in `vue/script-indent` rule

lib/utils/indent-ts.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,14 +1199,25 @@ function defineVisitor({
11991199
isOpeningParenToken
12001200
)
12011201
setOffset(leftParenToken, 1, firstToken)
1202-
const argument =
1203-
node.argument ||
1204-
/** @type {any} typescript-eslint v5 */ (node).parameter
1202+
1203+
const args = []
1204+
if (node.source) {
1205+
args.push(node.source)
1206+
} else {
1207+
// For old typescript-eslint parser
1208+
args.push(
1209+
node.argument ||
1210+
/** @type {any} typescript-eslint v5 */ (node).parameter
1211+
)
1212+
}
1213+
if (node.options) {
1214+
args.push(node.options)
1215+
}
12051216
const rightParenToken = tokenStore.getTokenAfter(
1206-
argument,
1217+
args[args.length - 1],
12071218
isClosingParenToken
12081219
)
1209-
processNodeList([argument], leftParenToken, rightParenToken, 1)
1220+
processNodeList(args, leftParenToken, rightParenToken, 1)
12101221
if (node.qualifier) {
12111222
const dotToken = tokenStore.getTokenBefore(node.qualifier)
12121223
const propertyToken = tokenStore.getTokenAfter(dotToken)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"types": "lib/index.d.ts",
77
"scripts": {
88
"new": "node tools/new-rule.js",
9-
"start": "npm run test:base -- --watch --growl",
9+
"start": "npm run test:base -- --watch",
1010
"test:base": "vitest run --reporter=dot tests/lib",
1111
"test": "vitest run",
1212
"test:integrations": "vitest run tests/integrations",

0 commit comments

Comments
 (0)