Skip to content

Commit 2eb51ab

Browse files
committed
Use getRootSymbols for all union property needs
1 parent 779db6e commit 2eb51ab

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

src/compiler/checker.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ module ts {
9393
getFullyQualifiedName: getFullyQualifiedName,
9494
getResolvedSignature: getResolvedSignature,
9595
getEnumMemberValue: getEnumMemberValue,
96-
getUnionTypesOfUnionProperty: getUnionTypesOfUnionProperty
9796
};
9897

9998
var undefinedSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "undefined");
@@ -1751,10 +1750,6 @@ module ts {
17511750
return links.type;
17521751
}
17531752

1754-
function getUnionTypesOfUnionProperty(symbol: Symbol): Type[] {
1755-
return (symbol.flags & SymbolFlags.UnionProperty) ? getSymbolLinks(symbol).unionType.types : undefined;
1756-
}
1757-
17581753
function getTypeOfSymbol(symbol: Symbol): Type {
17591754
if (symbol.flags & (SymbolFlags.Variable | SymbolFlags.Property)) {
17601755
return getTypeOfVariableOrParameterOrProperty(symbol);

src/compiler/types.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -657,8 +657,6 @@ module ts {
657657
getContextualType(node: Node): Type;
658658
getResolvedSignature(node: CallExpression, candidatesOutArray?: Signature[]): Signature;
659659

660-
getUnionTypesOfUnionProperty(symbol: Symbol): Type[];
661-
662660
// Returns the constant value of this enum member, or 'undefined' if the enum member has a
663661
// computed value.
664662
getEnumMemberValue(node: EnumMember): number;

src/services/services.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2619,8 +2619,8 @@ module ts {
26192619
var result: DefinitionInfo[] = [];
26202620

26212621
if (symbol.flags & SymbolFlags.UnionProperty) {
2622-
forEach(typeInfoResolver.getUnionTypesOfUnionProperty(symbol), t => {
2623-
getDefinitionFromSymbol(typeInfoResolver.getPropertyOfType(t, symbol.name), node, result);
2622+
forEach(typeInfoResolver.getRootSymbols(symbol), s => {
2623+
getDefinitionFromSymbol(s, node, result);
26242624
});
26252625
}
26262626
else {
@@ -3013,8 +3013,8 @@ module ts {
30133013
// Handel union properties
30143014
if (symbol.flags & SymbolFlags.UnionProperty) {
30153015
declarations = [];
3016-
forEach(typeInfoResolver.getUnionTypesOfUnionProperty(symbol), t => {
3017-
declarations.push.apply(declarations, t.getProperty(symbol.name).declarations);
3016+
forEach(typeInfoResolver.getRootSymbols(symbol), s => {
3017+
declarations.push.apply(declarations, s.declarations);
30183018
});
30193019
}
30203020

0 commit comments

Comments
 (0)