Merge branch 'master' into completionFixes

This commit is contained in:
Mohamed Hegazy
2014-10-28 09:10:03 -07:00
49 changed files with 636 additions and 332 deletions

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);
}
}