Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for ambient context instead of ambient flag

Browse Source
This commit is contained in:
Arthur Ozga
2015-06-03 15:51:59 -07:00
parent 323ce24287
commit 365ea3d909
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/checker.ts
+3 -3
View File
@@ -10415,8 +10415,8 @@ module ts {
});
}
// Non-ambient classes cannot merge with interfaces.
if (!(node.flags & NodeFlags.Ambient) && symbol.flags & SymbolFlags.Interface) {
// Interfaces cannot be merged with non-ambient classes.
if (symbol.flags & SymbolFlags.Interface && !isInAmbientContext(node)) {
error(node, Diagnostics.Only_an_ambient_class_can_be_merged_with_an_interface)
}
@@ -10603,7 +10603,7 @@ module ts {
// Interfaces cannot merge with non-ambient classes.
if (symbol && symbol.declarations) {
for (let declaration of symbol.declarations) {
if (declaration.kind === SyntaxKind.ClassDeclaration && !(declaration.flags & NodeFlags.Ambient)) {
if (declaration.kind === SyntaxKind.ClassDeclaration && !isInAmbientContext(declaration)) {
error(node, Diagnostics.Only_an_ambient_class_can_be_merged_with_an_interface);
break;
}