microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-23 18:48:40 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fixed bug with discovery in processTypes

Browse Source
This commit is contained in:
Ron Buckton
2015-10-14 13:49:17 -07:00
parent 6a61fd295c
commit 2e4975d4a8
2 changed files with 15 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/processTypes/discovery.ts
View File

@@ -308,13 +308,10 @@ export function discover(): DiscoveryResult {
function discoverTestableType(syntaxType: SyntaxType) {
if (syntaxType.type !== nodeType && !syntaxType.syntaxNodes) {
syntaxType.syntaxNodes = [];
if (syntaxType.type.findFirstAnnotation(/*inherited*/ false, KindAnnotation.match)) {
copySyntaxNodes(syntaxType.type, syntaxType.syntaxNodes, []);
}
else {
discoverSyntaxNodes(syntaxType.type, syntaxType.syntaxNodes, []);
}
let includeAliasAndUnionConstituents = !syntaxType.type.findFirstAnnotation(/*inherited*/ false, KindAnnotation.match);
discoverSyntaxNodes(syntaxType.type, syntaxType.syntaxNodes, [], includeAliasAndUnionConstituents);
if (syntaxType.syntaxNodes.length > 0) {
let testFunctionName = discoverIsAnyNodeFunctionName(syntaxType.type);
if (testFunctionName) {
@@ -325,7 +322,7 @@ export function discover(): DiscoveryResult {
}
}
function discoverSyntaxNodes(type: TypeInfo, syntaxNodes: SyntaxNode[], seen: boolean[]) {
function discoverSyntaxNodes(type: TypeInfo, syntaxNodes: SyntaxNode[], seen: boolean[], includeAliasAndUnionConstituents?: boolean) {
copySyntaxNodes(type, syntaxNodes, seen);
for (let aliasType of type.getAliases()) {
@@ -338,13 +335,15 @@ export function discover(): DiscoveryResult {
}
}
if (type.isTypeAlias) {
discoverSyntaxNodes(type.getAliasedType(), syntaxNodes, seen);
}
if (includeAliasAndUnionConstituents) {
if (type.isTypeAlias) {
discoverSyntaxNodes(type.getAliasedType(), syntaxNodes, seen);
}
if (type.isUnionType) {
for (let constituentType of type.getConstituentTypes()) {
discoverSyntaxNodes(constituentType, syntaxNodes, seen);
if (type.isUnionType) {
for (let constituentType of type.getConstituentTypes()) {
discoverSyntaxNodes(constituentType, syntaxNodes, seen);
}
}
}
}