microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-09 02:30:15 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Use Maps to store visited types and symbols

Browse Source
This commit is contained in:
Andrew Casey 2017-08-15 14:45:36 -07:00
parent 801c1f70a2
commit f2eacc6395
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/compiler/symbolWalker.ts
View File

@ -13,23 +13,23 @@ namespace ts {
return getSymbolWalker;
function getSymbolWalker(accept: (symbol: Symbol) => boolean = () => true): SymbolWalker {
let visitedTypes: Type[] = [];
let visitedSymbols: Symbol[] = [];
let visitedTypes = createMap<Type>(); // Key is id as string
let visitedSymbols = createMap<Symbol>(); // Key is id as string
return {
walkType: type =>
{
visitedTypes = [];
visitedSymbols = [];
visitedTypes.clear();
visitedSymbols.clear();
visitType(type);
return { visitedTypes, visitedSymbols };
return { visitedTypes: arrayFrom(visitedTypes.values()), visitedSymbols: arrayFrom(visitedSymbols.values()) };
},
walkSymbol: symbol =>
{
visitedTypes = [];
visitedSymbols = [];
visitedTypes.clear();
visitedSymbols.clear();
visitSymbol(symbol);
return { visitedTypes, visitedSymbols };
return { visitedTypes: arrayFrom(visitedTypes.values()), visitedSymbols: arrayFrom(visitedSymbols.values()) };
},
};
@ -37,10 +37,12 @@ namespace ts {
if (!type) {
return;
}
if (contains(visitedTypes, type)) {
const typeIdString = type.id.toString();
if (visitedTypes.has(typeIdString)) {
return;
}
visitedTypes.push(type);
visitedTypes.set(typeIdString, type);
// Reuse visitSymbol to visit the type's symbol,
// but be sure to bail on recuring into the type if accept declines the symbol.
@ -134,10 +136,11 @@ namespace ts {
if (!symbol) {
return;
}
if (contains(visitedSymbols, symbol)) {
const symbolIdString = getSymbolId(symbol).toString();
if (visitedSymbols.has(symbolIdString)) {
return;
}
visitedSymbols.push(symbol);
visitedSymbols.set(symbolIdString, symbol);
if (!accept(symbol)) {
return true;
}

6
src/compiler/types.ts
View File

@ -2673,8 +2673,10 @@ namespace ts {
/* @internal */
export interface SymbolWalker {
walkType(root: Type) : { visitedTypes: Type[], visitedSymbols: Symbol[] };
walkSymbol(root: Symbol) : { visitedTypes: Type[], visitedSymbols: Symbol[] };
/** Note: Return values are not ordered. */
walkType(root: Type) : { visitedTypes: ReadonlyArray<Type>, visitedSymbols: ReadonlyArray<Symbol> };
/** Note: Return values are not ordered. */
walkSymbol(root: Symbol) : { visitedTypes: ReadonlyArray<Type>, visitedSymbols: ReadonlyArray<Symbol> };
}
export interface SymbolDisplayBuilder {