Merge branch 'master' into completionFixes

This commit is contained in:
Mohamed Hegazy committed 2014-10-28 09:10:03 -07:00
commit 8d3fa047d6
49 files changed
+636 -332

No files matched your search

+1 -1
View File
@@ -3859,7 +3859,7 @@ module ts {
if (symbol.getFlags() && (SymbolFlags.Property | SymbolFlags.Method)) {
var privateDeclaration = forEach(symbol.getDeclarations(), d => (d.flags & NodeFlags.Private) ? d : undefined);
if (privateDeclaration) {
return privateDeclaration.parent;
return getAncestor(privateDeclaration, SyntaxKind.ClassDeclaration);
}
}