Skip to content

Commit c676893

Browse files
weswighamweswigham
authored
SyntaxKind.ImportTypeNode -> SyntaxKind.ImportType (microsoft#23120)
1 parent 84548d5 commit c676893

11 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎src/compiler/checker.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8886,7 +8886,7 @@ namespace ts {
88868886
return getTypeFromConditionalTypeNode(<ConditionalTypeNode>node);
88878887
case SyntaxKind.InferType:
88888888
return getTypeFromInferTypeNode(<InferTypeNode>node);
8889-
case SyntaxKind.ImportTypeNode:
8889+
case SyntaxKind.ImportType:
88908890
return getTypeFromImportTypeNode(<ImportTypeNode>node);
88918891
// This function assumes that an identifier or qualified name is a type expression
88928892
// Callers should first ensure this by calling isTypeNode
@@ -16252,7 +16252,7 @@ namespace ts {
1625216252
const flags = getDeclarationModifierFlagsFromSymbol(prop);
1625316253
const errorNode = node.kind === SyntaxKind.PropertyAccessExpression || node.kind === SyntaxKind.VariableDeclaration ?
1625416254
node.name :
16255-
node.kind === SyntaxKind.ImportTypeNode ?
16255+
node.kind === SyntaxKind.ImportType ?
1625616256
node :
1625716257
(<QualifiedName>node).right;
1625816258

@@ -16699,13 +16699,13 @@ namespace ts {
1669916699
return isValidPropertyAccessWithType(node, node.expression, propertyName, getWidenedType(checkExpression(node.expression)));
1670016700
case SyntaxKind.QualifiedName:
1670116701
return isValidPropertyAccessWithType(node, node.left, propertyName, getWidenedType(checkExpression(node.left)));
16702-
case SyntaxKind.ImportTypeNode:
16702+
case SyntaxKind.ImportType:
1670316703
return isValidPropertyAccessWithType(node, node, propertyName, getTypeFromTypeNode(node));
1670416704
}
1670516705
}
1670616706

1670716707
function isValidPropertyAccessForCompletions(node: PropertyAccessExpression | ImportTypeNode, type: Type, property: Symbol): boolean {
16708-
return isValidPropertyAccessWithType(node, node.kind === SyntaxKind.ImportTypeNode ? node : node.expression, property.escapedName, type)
16708+
return isValidPropertyAccessWithType(node, node.kind === SyntaxKind.ImportType ? node : node.expression, property.escapedName, type)
1670916709
&& (!(property.flags & SymbolFlags.Method) || isValidMethodAccess(property, type));
1671016710
}
1671116711
function isValidMethodAccess(method: Symbol, actualThisType: Type): boolean {
@@ -24613,7 +24613,7 @@ namespace ts {
2461324613
return checkConditionalType(<ConditionalTypeNode>node);
2461424614
case SyntaxKind.InferType:
2461524615
return checkInferType(<InferTypeNode>node);
24616-
case SyntaxKind.ImportTypeNode:
24616+
case SyntaxKind.ImportType:
2461724617
return checkImportType(<ImportTypeNode>node);
2461824618
case SyntaxKind.JSDocAugmentsTag:
2461924619
return checkJSDocAugmentsTag(node as JSDocAugmentsTag);
@@ -25131,7 +25131,7 @@ namespace ts {
2513125131
node = parent;
2513225132
parent = parent.parent;
2513325133
}
25134-
if (parent && parent.kind === SyntaxKind.ImportTypeNode && (parent as ImportTypeNode).qualifier === node) {
25134+
if (parent && parent.kind === SyntaxKind.ImportType && (parent as ImportTypeNode).qualifier === node) {
2513525135
return parent as ImportTypeNode;
2513625136
}
2513725137
return undefined;
@@ -25352,7 +25352,7 @@ namespace ts {
2535225352
case SyntaxKind.FunctionKeyword:
2535325353
case SyntaxKind.EqualsGreaterThanToken:
2535425354
return getSymbolOfNode(node.parent);
25355-
case SyntaxKind.ImportTypeNode:
25355+
case SyntaxKind.ImportType:
2535625356
return isLiteralImportTypeNode(node) ? getSymbolAtLocation(node.argument.literal) : undefined;
2535725357

2535825358
default:

‎src/compiler/emitter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ namespace ts {
615615
return emitMappedType(<MappedTypeNode>node);
616616
case SyntaxKind.LiteralType:
617617
return emitLiteralType(<LiteralTypeNode>node);
618-
case SyntaxKind.ImportTypeNode:
618+
case SyntaxKind.ImportType:
619619
return emitImportTypeNode(<ImportTypeNode>node);
620620
case SyntaxKind.JSDocAllType:
621621
write("*");

‎src/compiler/factory.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ namespace ts {
810810
}
811811

812812
export function createImportTypeNode(argument: TypeNode, qualifier?: EntityName, typeArguments?: ReadonlyArray<TypeNode>, isTypeOf?: boolean) {
813-
const node = <ImportTypeNode>createSynthesizedNode(SyntaxKind.ImportTypeNode);
813+
const node = <ImportTypeNode>createSynthesizedNode(SyntaxKind.ImportType);
814814
node.argument = argument;
815815
node.qualifier = qualifier;
816816
node.typeArguments = asNodeArray(typeArguments);

‎src/compiler/parser.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ namespace ts {
189189
visitNode(cbNode, (<ConditionalTypeNode>node).falseType);
190190
case SyntaxKind.InferType:
191191
return visitNode(cbNode, (<InferTypeNode>node).typeParameter);
192-
case SyntaxKind.ImportTypeNode:
192+
case SyntaxKind.ImportType:
193193
return visitNode(cbNode, (<ImportTypeNode>node).argument) ||
194194
visitNode(cbNode, (<ImportTypeNode>node).qualifier) ||
195195
visitNodes(cbNode, cbNodes, (<ImportTypeNode>node).typeArguments);
@@ -2744,7 +2744,7 @@ namespace ts {
27442744

27452745
function parseImportType(): ImportTypeNode {
27462746
sourceFile.flags |= NodeFlags.PossiblyContainsDynamicImport;
2747-
const node = createNode(SyntaxKind.ImportTypeNode) as ImportTypeNode;
2747+
const node = createNode(SyntaxKind.ImportType) as ImportTypeNode;
27482748
if (parseOptional(SyntaxKind.TypeOfKeyword)) {
27492749
node.isTypeOf = true;
27502750
}

‎src/compiler/transformers/declarations.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ namespace ts {
452452

453453
function rewriteModuleSpecifier<T extends Node>(parent: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration | ModuleDeclaration | ImportTypeNode, input: T): T | StringLiteral {
454454
if (!input) return;
455-
resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== SyntaxKind.ModuleDeclaration && parent.kind !== SyntaxKind.ImportTypeNode);
455+
resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== SyntaxKind.ModuleDeclaration && parent.kind !== SyntaxKind.ImportType);
456456
if (input.kind === SyntaxKind.StringLiteral && isBundledEmit) {
457457
const newName = getExternalModuleNameFromDeclaration(context.getEmitHost(), resolver, parent);
458458
if (newName) {
@@ -765,7 +765,7 @@ namespace ts {
765765
case SyntaxKind.ConstructorType: {
766766
return cleanup(updateConstructorTypeNode(input, visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), visitNode(input.type, visitDeclarationSubtree)));
767767
}
768-
case SyntaxKind.ImportTypeNode: {
768+
case SyntaxKind.ImportType: {
769769
if (!isLiteralImportTypeNode(input)) return cleanup(input);
770770
return cleanup(updateImportTypeNode(
771771
input,
@@ -1296,7 +1296,7 @@ namespace ts {
12961296
case SyntaxKind.ConditionalType:
12971297
case SyntaxKind.FunctionType:
12981298
case SyntaxKind.ConstructorType:
1299-
case SyntaxKind.ImportTypeNode:
1299+
case SyntaxKind.ImportType:
13001300
return true;
13011301
}
13021302
return false;

‎src/compiler/types.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ namespace ts {
284284
IndexedAccessType,
285285
MappedType,
286286
LiteralType,
287-
ImportTypeNode,
287+
ImportType,
288288
// Binding patterns
289289
ObjectBindingPattern,
290290
ArrayBindingPattern,
@@ -446,7 +446,7 @@ namespace ts {
446446
FirstFutureReservedWord = ImplementsKeyword,
447447
LastFutureReservedWord = YieldKeyword,
448448
FirstTypeNode = TypePredicate,
449-
LastTypeNode = ImportTypeNode,
449+
LastTypeNode = ImportType,
450450
FirstPunctuation = OpenBraceToken,
451451
LastPunctuation = CaretEqualsToken,
452452
FirstToken = Unknown,
@@ -1069,7 +1069,7 @@ namespace ts {
10691069
}
10701070

10711071
export interface ImportTypeNode extends NodeWithTypeArguments {
1072-
kind: SyntaxKind.ImportTypeNode;
1072+
kind: SyntaxKind.ImportType;
10731073
isTypeOf?: boolean;
10741074
argument: TypeNode;
10751075
qualifier?: EntityName;

‎src/compiler/utilities.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ namespace ts {
735735
}
736736

737737
export function isLiteralImportTypeNode(n: Node): n is LiteralImportTypeNode {
738-
return n.kind === SyntaxKind.ImportTypeNode &&
738+
return n.kind === SyntaxKind.ImportType &&
739739
(n as ImportTypeNode).argument.kind === SyntaxKind.LiteralType &&
740740
isStringLiteral(((n as ImportTypeNode).argument as LiteralTypeNode).literal);
741741
}
@@ -811,7 +811,7 @@ namespace ts {
811811
if (parent.kind === SyntaxKind.TypeQuery) {
812812
return false;
813813
}
814-
if (parent.kind === SyntaxKind.ImportTypeNode) {
814+
if (parent.kind === SyntaxKind.ImportType) {
815815
return !(parent as ImportTypeNode).isTypeOf;
816816
}
817817
// Do not recursively call isPartOfTypeNode on the parent. In the example:
@@ -1713,7 +1713,7 @@ namespace ts {
17131713
return node.moduleSpecifier;
17141714
case SyntaxKind.ImportEqualsDeclaration:
17151715
return node.moduleReference.kind === SyntaxKind.ExternalModuleReference ? node.moduleReference.expression : undefined;
1716-
case SyntaxKind.ImportTypeNode:
1716+
case SyntaxKind.ImportType:
17171717
return isLiteralImportTypeNode(node) ? node.argument.literal : undefined;
17181718
default:
17191719
return Debug.assertNever(node);
@@ -5736,7 +5736,7 @@ namespace ts {
57365736
const kind = node.kind;
57375737
return kind === SyntaxKind.PropertyAccessExpression
57385738
|| kind === SyntaxKind.QualifiedName
5739-
|| kind === SyntaxKind.ImportTypeNode;
5739+
|| kind === SyntaxKind.ImportType;
57405740
}
57415741

57425742
// Expression

‎src/compiler/visitor.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ namespace ts {
398398
return updateInferTypeNode(<InferTypeNode>node,
399399
visitNode((<InferTypeNode>node).typeParameter, visitor, isTypeParameterDeclaration));
400400

401-
case SyntaxKind.ImportTypeNode:
401+
case SyntaxKind.ImportType:
402402
return updateImportTypeNode(<ImportTypeNode>node,
403403
visitNode((<ImportTypeNode>node).argument, visitor, isTypeNode),
404404
visitNode((<ImportTypeNode>node).qualifier, visitor, isEntityName),

‎src/services/completions.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ namespace ts.Completions {
380380
// }
381381
// let x: Foo["/*completion position*/"]
382382
return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode((node.parent.parent as IndexedAccessTypeNode).objectType));
383-
case SyntaxKind.ImportTypeNode:
383+
case SyntaxKind.ImportType:
384384
return { kind: StringLiteralCompletionKind.Paths, paths: PathCompletions.getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker) };
385385
default:
386386
return undefined;
@@ -881,7 +881,7 @@ namespace ts.Completions {
881881
case SyntaxKind.QualifiedName:
882882
node = (parent as QualifiedName).left;
883883
break;
884-
case SyntaxKind.ImportTypeNode:
884+
case SyntaxKind.ImportType:
885885
node = parent;
886886
break;
887887
default:
@@ -1067,7 +1067,7 @@ namespace ts.Completions {
10671067
}
10681068
else {
10691069
for (const symbol of type.getApparentProperties()) {
1070-
if (typeChecker.isValidPropertyAccessForCompletions(node.kind === SyntaxKind.ImportTypeNode ? <ImportTypeNode>node : <PropertyAccessExpression>node.parent, type, symbol)) {
1070+
if (typeChecker.isValidPropertyAccessForCompletions(node.kind === SyntaxKind.ImportType ? <ImportTypeNode>node : <PropertyAccessExpression>node.parent, type, symbol)) {
10711071
addPropertySymbol(symbol);
10721072
}
10731073
}

‎tests/baselines/reference/api/tsserverlibrary.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ declare namespace ts {
240240
IndexedAccessType = 175,
241241
MappedType = 176,
242242
LiteralType = 177,
243-
ImportTypeNode = 178,
243+
ImportType = 178,
244244
ObjectBindingPattern = 179,
245245
ArrayBindingPattern = 180,
246246
BindingElement = 181,
@@ -699,7 +699,7 @@ declare namespace ts {
699699
kind: SyntaxKind.AnyKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.StringKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.VoidKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.NullKeyword | SyntaxKind.NeverKeyword;
700700
}
701701
interface ImportTypeNode extends NodeWithTypeArguments {
702-
kind: SyntaxKind.ImportTypeNode;
702+
kind: SyntaxKind.ImportType;
703703
isTypeOf?: boolean;
704704
argument: TypeNode;
705705
qualifier?: EntityName;

0 commit comments

Comments
 (0)