Skip to content

Commit 050126c

Browse files
author
Andy
authored
Rename isTypeParameter to isTypeParameterDeclaration (#16422)
1 parent dde60bb commit 050126c

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

src/compiler/checker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5973,7 +5973,7 @@ namespace ts {
59735973
typeParameter.default = targetDefault ? instantiateType(targetDefault, typeParameter.mapper) : noConstraintType;
59745974
}
59755975
else {
5976-
const defaultDeclaration = typeParameter.symbol && forEach(typeParameter.symbol.declarations, decl => isTypeParameter(decl) && decl.default);
5976+
const defaultDeclaration = typeParameter.symbol && forEach(typeParameter.symbol.declarations, decl => isTypeParameterDeclaration(decl) && decl.default);
59775977
typeParameter.default = defaultDeclaration ? getTypeFromTypeNode(defaultDeclaration) : noConstraintType;
59785978
}
59795979
}

src/compiler/utilities.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4098,7 +4098,7 @@ namespace ts {
40984098

40994099
// Signature elements
41004100

4101-
export function isTypeParameter(node: Node): node is TypeParameterDeclaration {
4101+
export function isTypeParameterDeclaration(node: Node): node is TypeParameterDeclaration {
41024102
return node.kind === SyntaxKind.TypeParameter;
41034103
}
41044104

src/compiler/visitor.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ namespace ts {
275275

276276
case SyntaxKind.MethodSignature:
277277
return updateMethodSignature(<MethodSignature>node,
278-
nodesVisitor((<MethodSignature>node).typeParameters, visitor, isTypeParameter),
278+
nodesVisitor((<MethodSignature>node).typeParameters, visitor, isTypeParameterDeclaration),
279279
nodesVisitor((<MethodSignature>node).parameters, visitor, isParameterDeclaration),
280280
visitNode((<MethodSignature>node).type, visitor, isTypeNode),
281281
visitNode((<MethodSignature>node).name, visitor, isPropertyName),
@@ -288,7 +288,7 @@ namespace ts {
288288
visitNode((<MethodDeclaration>node).asteriskToken, tokenVisitor, isToken),
289289
visitNode((<MethodDeclaration>node).name, visitor, isPropertyName),
290290
visitNode((<MethodDeclaration>node).questionToken, tokenVisitor, isToken),
291-
nodesVisitor((<MethodDeclaration>node).typeParameters, visitor, isTypeParameter),
291+
nodesVisitor((<MethodDeclaration>node).typeParameters, visitor, isTypeParameterDeclaration),
292292
visitParameterList((<MethodDeclaration>node).parameters, visitor, context, nodesVisitor),
293293
visitNode((<MethodDeclaration>node).type, visitor, isTypeNode),
294294
visitFunctionBody((<MethodDeclaration>node).body, visitor, context));
@@ -319,13 +319,13 @@ namespace ts {
319319

320320
case SyntaxKind.CallSignature:
321321
return updateCallSignature(<CallSignatureDeclaration>node,
322-
nodesVisitor((<CallSignatureDeclaration>node).typeParameters, visitor, isTypeParameter),
322+
nodesVisitor((<CallSignatureDeclaration>node).typeParameters, visitor, isTypeParameterDeclaration),
323323
nodesVisitor((<CallSignatureDeclaration>node).parameters, visitor, isParameterDeclaration),
324324
visitNode((<CallSignatureDeclaration>node).type, visitor, isTypeNode));
325325

326326
case SyntaxKind.ConstructSignature:
327327
return updateConstructSignature(<ConstructSignatureDeclaration>node,
328-
nodesVisitor((<ConstructSignatureDeclaration>node).typeParameters, visitor, isTypeParameter),
328+
nodesVisitor((<ConstructSignatureDeclaration>node).typeParameters, visitor, isTypeParameterDeclaration),
329329
nodesVisitor((<ConstructSignatureDeclaration>node).parameters, visitor, isParameterDeclaration),
330330
visitNode((<ConstructSignatureDeclaration>node).type, visitor, isTypeNode));
331331

@@ -350,13 +350,13 @@ namespace ts {
350350

351351
case SyntaxKind.FunctionType:
352352
return updateFunctionTypeNode(<FunctionTypeNode>node,
353-
nodesVisitor((<FunctionTypeNode>node).typeParameters, visitor, isTypeParameter),
353+
nodesVisitor((<FunctionTypeNode>node).typeParameters, visitor, isTypeParameterDeclaration),
354354
nodesVisitor((<FunctionTypeNode>node).parameters, visitor, isParameterDeclaration),
355355
visitNode((<FunctionTypeNode>node).type, visitor, isTypeNode));
356356

357357
case SyntaxKind.ConstructorType:
358358
return updateConstructorTypeNode(<ConstructorTypeNode>node,
359-
nodesVisitor((<ConstructorTypeNode>node).typeParameters, visitor, isTypeParameter),
359+
nodesVisitor((<ConstructorTypeNode>node).typeParameters, visitor, isTypeParameterDeclaration),
360360
nodesVisitor((<ConstructorTypeNode>node).parameters, visitor, isParameterDeclaration),
361361
visitNode((<ConstructorTypeNode>node).type, visitor, isTypeNode));
362362

@@ -400,7 +400,7 @@ namespace ts {
400400
case SyntaxKind.MappedType:
401401
return updateMappedTypeNode((<MappedTypeNode>node),
402402
visitNode((<MappedTypeNode>node).readonlyToken, tokenVisitor, isToken),
403-
visitNode((<MappedTypeNode>node).typeParameter, visitor, isTypeParameter),
403+
visitNode((<MappedTypeNode>node).typeParameter, visitor, isTypeParameterDeclaration),
404404
visitNode((<MappedTypeNode>node).questionToken, tokenVisitor, isToken),
405405
visitNode((<MappedTypeNode>node).type, visitor, isTypeNode));
406406

@@ -476,15 +476,15 @@ namespace ts {
476476
nodesVisitor((<FunctionExpression>node).modifiers, visitor, isModifier),
477477
visitNode((<FunctionExpression>node).asteriskToken, tokenVisitor, isToken),
478478
visitNode((<FunctionExpression>node).name, visitor, isIdentifier),
479-
nodesVisitor((<FunctionExpression>node).typeParameters, visitor, isTypeParameter),
479+
nodesVisitor((<FunctionExpression>node).typeParameters, visitor, isTypeParameterDeclaration),
480480
visitParameterList((<FunctionExpression>node).parameters, visitor, context, nodesVisitor),
481481
visitNode((<FunctionExpression>node).type, visitor, isTypeNode),
482482
visitFunctionBody((<FunctionExpression>node).body, visitor, context));
483483

484484
case SyntaxKind.ArrowFunction:
485485
return updateArrowFunction(<ArrowFunction>node,
486486
nodesVisitor((<ArrowFunction>node).modifiers, visitor, isModifier),
487-
nodesVisitor((<ArrowFunction>node).typeParameters, visitor, isTypeParameter),
487+
nodesVisitor((<ArrowFunction>node).typeParameters, visitor, isTypeParameterDeclaration),
488488
visitParameterList((<ArrowFunction>node).parameters, visitor, context, nodesVisitor),
489489
visitNode((<ArrowFunction>node).type, visitor, isTypeNode),
490490
visitFunctionBody((<ArrowFunction>node).body, visitor, context));
@@ -543,7 +543,7 @@ namespace ts {
543543
return updateClassExpression(<ClassExpression>node,
544544
nodesVisitor((<ClassExpression>node).modifiers, visitor, isModifier),
545545
visitNode((<ClassExpression>node).name, visitor, isIdentifier),
546-
nodesVisitor((<ClassExpression>node).typeParameters, visitor, isTypeParameter),
546+
nodesVisitor((<ClassExpression>node).typeParameters, visitor, isTypeParameterDeclaration),
547547
nodesVisitor((<ClassExpression>node).heritageClauses, visitor, isHeritageClause),
548548
nodesVisitor((<ClassExpression>node).members, visitor, isClassElement));
549549

@@ -676,7 +676,7 @@ namespace ts {
676676
nodesVisitor((<FunctionDeclaration>node).modifiers, visitor, isModifier),
677677
visitNode((<FunctionDeclaration>node).asteriskToken, tokenVisitor, isToken),
678678
visitNode((<FunctionDeclaration>node).name, visitor, isIdentifier),
679-
nodesVisitor((<FunctionDeclaration>node).typeParameters, visitor, isTypeParameter),
679+
nodesVisitor((<FunctionDeclaration>node).typeParameters, visitor, isTypeParameterDeclaration),
680680
visitParameterList((<FunctionDeclaration>node).parameters, visitor, context, nodesVisitor),
681681
visitNode((<FunctionDeclaration>node).type, visitor, isTypeNode),
682682
visitFunctionBody((<FunctionExpression>node).body, visitor, context));
@@ -686,7 +686,7 @@ namespace ts {
686686
nodesVisitor((<ClassDeclaration>node).decorators, visitor, isDecorator),
687687
nodesVisitor((<ClassDeclaration>node).modifiers, visitor, isModifier),
688688
visitNode((<ClassDeclaration>node).name, visitor, isIdentifier),
689-
nodesVisitor((<ClassDeclaration>node).typeParameters, visitor, isTypeParameter),
689+
nodesVisitor((<ClassDeclaration>node).typeParameters, visitor, isTypeParameterDeclaration),
690690
nodesVisitor((<ClassDeclaration>node).heritageClauses, visitor, isHeritageClause),
691691
nodesVisitor((<ClassDeclaration>node).members, visitor, isClassElement));
692692

@@ -695,7 +695,7 @@ namespace ts {
695695
nodesVisitor((<InterfaceDeclaration>node).decorators, visitor, isDecorator),
696696
nodesVisitor((<InterfaceDeclaration>node).modifiers, visitor, isModifier),
697697
visitNode((<InterfaceDeclaration>node).name, visitor, isIdentifier),
698-
nodesVisitor((<InterfaceDeclaration>node).typeParameters, visitor, isTypeParameter),
698+
nodesVisitor((<InterfaceDeclaration>node).typeParameters, visitor, isTypeParameterDeclaration),
699699
nodesVisitor((<InterfaceDeclaration>node).heritageClauses, visitor, isHeritageClause),
700700
nodesVisitor((<InterfaceDeclaration>node).members, visitor, isTypeElement));
701701

@@ -704,7 +704,7 @@ namespace ts {
704704
nodesVisitor((<TypeAliasDeclaration>node).decorators, visitor, isDecorator),
705705
nodesVisitor((<TypeAliasDeclaration>node).modifiers, visitor, isModifier),
706706
visitNode((<TypeAliasDeclaration>node).name, visitor, isIdentifier),
707-
nodesVisitor((<TypeAliasDeclaration>node).typeParameters, visitor, isTypeParameter),
707+
nodesVisitor((<TypeAliasDeclaration>node).typeParameters, visitor, isTypeParameterDeclaration),
708708
visitNode((<TypeAliasDeclaration>node).type, visitor, isTypeNode));
709709

710710
case SyntaxKind.EnumDeclaration:

0 commit comments

Comments
 (0)