Merge remote-tracking branch 'origin/master' into pathMappingModuleResolution

This commit is contained in:
Vladimir Matveev committed 2015-11-28 12:42:07 -08:00
commit cc25f2c588
4 files changed
+104 -1

No files matched your search

+3 -1
View File
@@ -11439,7 +11439,9 @@ namespace ts {
seen = c === node;
}
});
if (subsequentNode) {
// We may be here because of some extra junk between overloads that could not be parsed into a valid node.
// In this case the subsequent node is not really consecutive (.pos !== node.end), and we must ignore it here.
if (subsequentNode && subsequentNode.pos === node.end) {
if (subsequentNode.kind === node.kind) {
const errorNode: Node = (<FunctionLikeDeclaration>subsequentNode).name || subsequentNode;
// TODO(jfreeman): These are methods, so handle computed name case