mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-11-18 20:11:14 +00:00
Consistent errors on circular base types (#39675)
* Properly track and report errors on circular base types * Accept new baselines * Add regression test
This commit is contained in:
1 parent
5ae4b5d715
commit
94d6b4507e
12 files changed
+189
-17
No files matched your search
+30
-13
@@ -166,6 +166,7 @@ namespace ts {
|
||||
ImmediateBaseConstraint,
|
||||
EnumTagType,
|
||||
ResolvedTypeArguments,
|
||||
ResolvedBaseTypes,
|
||||
}
|
||||
|
||||
const enum CheckMode {
|
||||
@@ -7491,6 +7492,8 @@ namespace ts {
|
||||
return !!(<Type>target).immediateBaseConstraint;
|
||||
case TypeSystemPropertyName.ResolvedTypeArguments:
|
||||
return !!(target as TypeReference).resolvedTypeArguments;
|
||||
case TypeSystemPropertyName.ResolvedBaseTypes:
|
||||
return !!(target as InterfaceType).baseTypesResolved;
|
||||
}
|
||||
return Debug.assertNever(propertyName);
|
||||
}
|
||||
@@ -8917,22 +8920,36 @@ namespace ts {
|
||||
return resolvedImplementsTypes;
|
||||
}
|
||||
|
||||
function reportCircularBaseType(node: Node, type: Type) {
|
||||
error(node, Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, /*enclosingDeclaration*/ undefined, TypeFormatFlags.WriteArrayAsGenericType));
|
||||
}
|
||||
|
||||
function getBaseTypes(type: InterfaceType): BaseType[] {
|
||||
if (!type.resolvedBaseTypes) {
|
||||
if (type.objectFlags & ObjectFlags.Tuple) {
|
||||
type.resolvedBaseTypes = [getTupleBaseType(<TupleType>type)];
|
||||
}
|
||||
else if (type.symbol.flags & (SymbolFlags.Class | SymbolFlags.Interface)) {
|
||||
if (type.symbol.flags & SymbolFlags.Class) {
|
||||
resolveBaseTypesOfClass(type);
|
||||
if (!type.baseTypesResolved) {
|
||||
if (pushTypeResolution(type, TypeSystemPropertyName.ResolvedBaseTypes)) {
|
||||
if (type.objectFlags & ObjectFlags.Tuple) {
|
||||
type.resolvedBaseTypes = [getTupleBaseType(<TupleType>type)];
|
||||
}
|
||||
if (type.symbol.flags & SymbolFlags.Interface) {
|
||||
resolveBaseTypesOfInterface(type);
|
||||
else if (type.symbol.flags & (SymbolFlags.Class | SymbolFlags.Interface)) {
|
||||
if (type.symbol.flags & SymbolFlags.Class) {
|
||||
resolveBaseTypesOfClass(type);
|
||||
}
|
||||
if (type.symbol.flags & SymbolFlags.Interface) {
|
||||
resolveBaseTypesOfInterface(type);
|
||||
}
|
||||
}
|
||||
else {
|
||||
Debug.fail("type must be class or interface");
|
||||
}
|
||||
if (!popTypeResolution()) {
|
||||
for (const declaration of type.symbol.declarations) {
|
||||
if (declaration.kind === SyntaxKind.ClassDeclaration || declaration.kind === SyntaxKind.InterfaceDeclaration) {
|
||||
reportCircularBaseType(declaration, type);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
Debug.fail("type must be class or interface");
|
||||
}
|
||||
type.baseTypesResolved = true;
|
||||
}
|
||||
return type.resolvedBaseTypes;
|
||||
}
|
||||
@@ -9041,7 +9058,7 @@ namespace ts {
|
||||
}
|
||||
}
|
||||
else {
|
||||
error(declaration, Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, /*enclosingDeclaration*/ undefined, TypeFormatFlags.WriteArrayAsGenericType));
|
||||
reportCircularBaseType(declaration, type);
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -5050,6 +5050,8 @@ namespace ts {
|
||||
resolvedBaseConstructorType?: Type; // Resolved base constructor type of class
|
||||
/* @internal */
|
||||
resolvedBaseTypes: BaseType[]; // Resolved base types
|
||||
/* @internal */
|
||||
baseTypesResolved?: boolean;
|
||||
}
|
||||
|
||||
// Object type or intersection of object types
|
||||
|
||||
Reference in new issue
Block a user