Content-Length: 6077 | pFad | http://github.com/typescript-eslint/typescript-eslint/pull/11279.patch

thub.com From b5f818603b1395fed4bc3a8a87dc0a51e51f7e0e Mon Sep 17 00:00:00 2001 From: overlookmotel Date: Fri, 6 Jun 2025 11:34:12 +0100 Subject: [PATCH] fix(visitor-keys): fix visitor keys order --- .../fixtures/type-declaration/index-access2.ts.shot | 4 ++-- .../fixtures/type-declaration/index-access3.ts.shot | 4 ++-- .../fixtures/type-declaration/mapped-named.ts.shot | 4 ++-- .../tests/fixtures/type-declaration/mapped.ts.shot | 4 ++-- packages/visitor-keys/src/visitor-keys.ts | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/scope-manager/tests/fixtures/type-declaration/index-access2.ts.shot b/packages/scope-manager/tests/fixtures/type-declaration/index-access2.ts.shot index cf446d378a40..815710f93125 100644 --- a/packages/scope-manager/tests/fixtures/type-declaration/index-access2.ts.shot +++ b/packages/scope-manager/tests/fixtures/type-declaration/index-access2.ts.shot @@ -10,7 +10,7 @@ ScopeManager { ], name: "T", references: [ - Reference$2 { + Reference$1 { identifier: Identifier<"T">, isRead: true, isTypeReference: true, @@ -31,7 +31,7 @@ ScopeManager { ], name: "K", references: [ - Reference$1 { + Reference$2 { identifier: Identifier<"K">, isRead: true, isTypeReference: true, diff --git a/packages/scope-manager/tests/fixtures/type-declaration/index-access3.ts.shot b/packages/scope-manager/tests/fixtures/type-declaration/index-access3.ts.shot index 95e5ef75c6c2..d6665e50476b 100644 --- a/packages/scope-manager/tests/fixtures/type-declaration/index-access3.ts.shot +++ b/packages/scope-manager/tests/fixtures/type-declaration/index-access3.ts.shot @@ -10,7 +10,7 @@ ScopeManager { ], name: "T", references: [ - Reference$3 { + Reference$2 { identifier: Identifier<"T">, isRead: true, isTypeReference: true, @@ -41,7 +41,7 @@ ScopeManager { resolved: Variable$3, writeExpr: Literal$3, }, - Reference$2 { + Reference$3 { identifier: Identifier<"k">, isRead: true, isTypeReference: false, diff --git a/packages/scope-manager/tests/fixtures/type-declaration/mapped-named.ts.shot b/packages/scope-manager/tests/fixtures/type-declaration/mapped-named.ts.shot index 526c1a55b9a4..8899edb1db89 100644 --- a/packages/scope-manager/tests/fixtures/type-declaration/mapped-named.ts.shot +++ b/packages/scope-manager/tests/fixtures/type-declaration/mapped-named.ts.shot @@ -10,7 +10,7 @@ ScopeManager { ], name: "T", references: [ - Reference$4 { + Reference$3 { identifier: Identifier<"T">, isRead: true, isTypeReference: true, @@ -51,7 +51,7 @@ ScopeManager { isWrite: false, resolved: Variable$4, }, - Reference$3 { + Reference$4 { identifier: Identifier<"k">, isRead: true, isTypeReference: true, diff --git a/packages/scope-manager/tests/fixtures/type-declaration/mapped.ts.shot b/packages/scope-manager/tests/fixtures/type-declaration/mapped.ts.shot index 3f0c6e23cd71..4cc942930bd4 100644 --- a/packages/scope-manager/tests/fixtures/type-declaration/mapped.ts.shot +++ b/packages/scope-manager/tests/fixtures/type-declaration/mapped.ts.shot @@ -10,7 +10,7 @@ ScopeManager { ], name: "T", references: [ - Reference$3 { + Reference$2 { identifier: Identifier<"T">, isRead: true, isTypeReference: true, @@ -43,7 +43,7 @@ ScopeManager { ], name: "k", references: [ - Reference$2 { + Reference$3 { identifier: Identifier<"k">, isRead: true, isTypeReference: true, diff --git a/packages/visitor-keys/src/visitor-keys.ts b/packages/visitor-keys/src/visitor-keys.ts index 283d2f36e389..8fd0d512ac98 100644 --- a/packages/visitor-keys/src/visitor-keys.ts +++ b/packages/visitor-keys/src/visitor-keys.ts @@ -213,8 +213,8 @@ const additionalKeys: AdditionalKeys = { TSExternalModuleReference: ['expression'], TSFunctionType: SharedVisitorKeys.FunctionType, TSImportEqualsDeclaration: ['id', 'moduleReference'], - TSImportType: ['argument', 'qualifier', 'typeArguments', 'options'], - TSIndexedAccessType: ['indexType', 'objectType'], + TSImportType: ['argument', 'options', 'qualifier', 'typeArguments'], + TSIndexedAccessType: ['objectType', 'indexType'], TSIndexSignature: ['parameters', 'typeAnnotation'], TSInferType: ['typeParameter'], TSInstantiationExpression: ['expression', 'typeArguments'], @@ -225,7 +225,7 @@ const additionalKeys: AdditionalKeys = { TSIntrinsicKeyword: [], TSLiteralType: ['literal'], TSMappedType: ['key', 'constraint', 'nameType', 'typeAnnotation'], - TSMethodSignature: ['typeParameters', 'key', 'params', 'returnType'], + TSMethodSignature: ['key', 'typeParameters', 'params', 'returnType'], TSModuleBlock: ['body'], TSModuleDeclaration: ['id', 'body'], TSNamedTupleMember: ['label', 'elementType'], @@ -238,7 +238,7 @@ const additionalKeys: AdditionalKeys = { TSOptionalType: ['typeAnnotation'], TSParameterProperty: ['decorators', 'parameter'], TSPrivateKeyword: [], - TSPropertySignature: ['typeAnnotation', 'key'], + TSPropertySignature: ['key', 'typeAnnotation'], TSProtectedKeyword: [], TSPublicKeyword: [], TSQualifiedName: ['left', 'right'], @@ -259,7 +259,7 @@ const additionalKeys: AdditionalKeys = { TSTypeParameter: ['name', 'constraint', 'default'], TSTypeParameterDeclaration: ['params'], TSTypeParameterInstantiation: ['params'], - TSTypePredicate: ['typeAnnotation', 'parameterName'], + TSTypePredicate: ['parameterName', 'typeAnnotation'], TSTypeQuery: ['exprName', 'typeArguments'], TSTypeReference: ['typeName', 'typeArguments'], TSUndefinedKeyword: [],

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!