maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use resolveEntityName to find interface

Browse source
This commit is contained in:
Herrington Darkholme 2016-06-17 10:22:56 +08:00
parent c721b5f981
commit 38962eea82
1 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/compiler/checker.ts
View file

@ -939,29 +939,26 @@ namespace ts {
function checkAndReportErrorForExtendingInterface(errorLocation: Node): boolean {
const container = getContainingClass(errorLocation);
const heritageClause = <HeritageClause>getAncestor(errorLocation, SyntaxKind.HeritageClause);
if (!container || !heritageClause || heritageClause.token !== SyntaxKind.ExtendsKeyword) {
let parentClassExpression = errorLocation;
while (parentClassExpression) {
const kind = parentClassExpression.kind;
if (kind === SyntaxKind.Identifier || kind === SyntaxKind.PropertyAccessExpression) {
parentClassExpression = parentClassExpression.parent;
continue;
}
if (kind === SyntaxKind.ExpressionWithTypeArguments) {
break;
}
return false;
}
if (errorLocation.kind === SyntaxKind.Identifier) {
const name = (<Identifier>errorLocation).text;
const interfaceOrModule = resolveName(
errorLocation, name,
SymbolFlags.Interface | SymbolFlags.HasExports,
/*errorMessage*/ undefined, /*nameArg*/ undefined)
if (!interfaceOrModule) {
return false;
}
if (interfaceOrModule.flags & SymbolFlags.Interface) {
error(errorLocation, Diagnostics.Cannot_extend_an_interface_0_Did_you_mean_implements, name);
return true;
}
if (!parentClassExpression) {
return false;
}
else if (errorLocation.kind === SyntaxKind.PropertyAccessExpression) {
// todo
const expression = (<ExpressionWithTypeArguments>parentClassExpression).expression;
if (resolveEntityName(expression, SymbolFlags.Interface, true)) {
error(errorLocation, Diagnostics.Cannot_extend_an_interface_0_Did_you_mean_implements, getTextOfNode(expression));
return true;
}
return false;
}