Skip to content

Commit 9afb83b

Browse files
committed
Reuse exiting getFirstIdentifier function
1 parent b40f995 commit 9afb83b

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

src/compiler/checker.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ namespace ts {
205205
getEmitResolver,
206206
getExportsOfModule: getExportsOfModuleAsArray,
207207
getExportsAndPropertiesOfModule,
208-
getSymbolWalker: createGetSymbolWalker(getRestTypeOfSignature, getReturnTypeOfSignature, getBaseTypes, resolveStructuredTypeMembers, getTypeOfSymbol, getResolvedSymbol, getIndexTypeOfStructuredType, getConstraintFromTypeParameter),
208+
getSymbolWalker: createGetSymbolWalker(getRestTypeOfSignature, getReturnTypeOfSignature, getBaseTypes, resolveStructuredTypeMembers, getTypeOfSymbol, getResolvedSymbol, getIndexTypeOfStructuredType, getConstraintFromTypeParameter, getFirstIdentifier),
209209
getAmbientModules,
210210
getAllAttributesTypeFromJsxOpeningLikeElement: node => {
211211
node = getParseTreeNode(node, isJsxOpeningLikeElement);

src/compiler/symbolWalker.ts

+3-11
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ namespace ts {
88
getTypeOfSymbol: (sym: Symbol) => Type,
99
getResolvedSymbol: (node: Node) => Symbol,
1010
getIndexTypeOfStructuredType: (type: Type, kind: IndexKind) => Type,
11-
getConstraintFromTypeParameter: (typeParameter: TypeParameter) => Type) {
11+
getConstraintFromTypeParameter: (typeParameter: TypeParameter) => Type,
12+
getFirstIdentifier: (node: EntityNameOrEntityNameExpression) => Identifier) {
1213

1314
return getSymbolWalker;
1415

@@ -180,20 +181,11 @@ namespace ts {
180181
// query node on any of the symbol's declarations and get symbols there
181182
if ((d as any).type && (d as any).type.kind === SyntaxKind.TypeQuery) {
182183
const query = (d as any).type as TypeQueryNode;
183-
const entity = leftmostSymbol(query.exprName);
184+
const entity = getResolvedSymbol(getFirstIdentifier(query.exprName));
184185
visitSymbol(entity);
185186
}
186187
});
187188
}
188189
}
189-
190-
function leftmostSymbol(expr: QualifiedName | Identifier): Symbol {
191-
if (expr.kind === SyntaxKind.Identifier) {
192-
return getResolvedSymbol(expr as Identifier);
193-
}
194-
else {
195-
return leftmostSymbol((expr as QualifiedName).left);
196-
}
197-
}
198190
}
199191
}

0 commit comments

Comments
 (0)