microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-13 05:37:13 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Better error message for excessive instantiation depth

Browse Source
This commit is contained in:
Anders Hejlsberg
2018-02-20 07:52:07 -10:00
parent 0cc4e8f00d
commit 099d3da1d0
2 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/compiler/checker.ts
View File

@@ -57,8 +57,9 @@ namespace ts {
let typeCount = 0;
let symbolCount = 0;
let enumCount = 0;
let typeInstantiationDepth = 0;
let symbolInstantiationDepth = 0;
let aliasInstantiationDepth = 0;
const aliasInstantiations: Symbol[] = [];
const emptySymbols = createSymbolTable();
const identityMapper: (type: Type) => Type = identity;
@@ -8909,23 +8910,43 @@ namespace ts {
return getConditionalType(root, mapper);
}
function getErrorNodeForType(type: Type): Node {
return type.aliasSymbol && type.aliasTypeArguments && getDeclarationOfKind(type.aliasSymbol, SyntaxKind.TypeAliasDeclaration);
function getInstantiationErrorTypeAlias() {
const counted: Symbol[] = [];
let topCount = 0;
let topSymbol: Symbol;
for (let i = 0; i < aliasInstantiationDepth - topCount; i++) {
const symbol = aliasInstantiations[i];
if (counted.indexOf(symbol) < 0) {
counted.push(symbol);
let count = 0;
for (let j = i; j < aliasInstantiationDepth; j++) {
if (symbol === aliasInstantiations[j]) count++;
}
if (count > topCount) {
topCount = count;
topSymbol = symbol;
}
}
}
return topSymbol && <TypeAliasDeclaration>getDeclarationOfKind(topSymbol, SyntaxKind.TypeAliasDeclaration);
}
function instantiateType(type: Type, mapper: TypeMapper): Type {
if (type && mapper && mapper !== identityMapper) {
if (typeInstantiationDepth >= 100) {
const node = getErrorNodeForType(type);
if (node) {
error(node, Diagnostics.Generic_type_instantiation_is_excessively_deep_and_possibly_infinite);
return unknownType;
}
if (aliasInstantiationDepth >= 100) {
const declaration = getInstantiationErrorTypeAlias();
error(declaration, Diagnostics.Recursive_instantiations_of_type_0_are_excessively_deep_and_possibly_infinite,
declarationNameToString(declaration.name));
return unknownType;
}
typeInstantiationDepth++;
const result = instantiateTypeWorker(type, mapper);
typeInstantiationDepth--;
return result;
if (type.aliasSymbol) {
aliasInstantiations[aliasInstantiationDepth] = type.aliasSymbol;
aliasInstantiationDepth++;
const result = instantiateTypeWorker(type, mapper);
aliasInstantiationDepth--;
return result;
}
return instantiateTypeWorker(type, mapper);
}
return type;
}

4
src/compiler/diagnosticMessages.json
View File

@@ -1988,6 +1988,10 @@
"category": "Error",
"code": 2567
},
"Recursive instantiations of type '{0}' are excessively deep and possibly infinite.": {
"category": "Error",
"code": 2568
},
"JSX element attributes type '{0}' may not be a union type.": {
"category": "Error",