Merge branch 'master' into projzilla

This commit is contained in:
Ryan Cavanaugh
2018-06-11 11:15:21 -07:00
13 changed files with 1278 additions and 10 deletions

View File

@@ -1035,14 +1035,16 @@ namespace ts.FindAllReferences.Core {
if (!(isMethodOrAccessor(member) && hasModifier(member, ModifierFlags.Static))) {
continue;
}
member.body!.forEachChild(function cb(node) {
if (node.kind === SyntaxKind.ThisKeyword) {
addRef(node);
}
else if (!isFunctionLike(node)) {
node.forEachChild(cb);
}
});
if (member.body) {
member.body.forEachChild(function cb(node) {
if (node.kind === SyntaxKind.ThisKeyword) {
addRef(node);
}
else if (!isFunctionLike(node) && !isClassLike(node)) {
node.forEachChild(cb);
}
});
}
}
}