Merge pull request microsoft#12898 from Microsoft/NavigateToFixForIIFE

jramsay · web-flow · commit 2e97cffe6111 · 2016-12-14T10:56:44.000-08:00
NavigateTo is not working correctly for declarations in IIFEs
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -592,9 +592,8 @@ namespace ts {
                             else {
                                 declarations.push(functionDeclaration);
                             }
-
-                            forEachChild(node, visit);
                         }
+                        forEachChild(node, visit);
                         break;
 
                     case SyntaxKind.ClassDeclaration:
diff --git a/tests/cases/fourslash/navigateToIIFE.ts b/tests/cases/fourslash/navigateToIIFE.ts
@@ -0,0 +1,19 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: file1.ts
+/////*1*/(function () {
+////    "use strict";
+////    function onResume() {
+////    };
+////} )();
+// @Filename: file2.ts
+/////*2*/class EventManager {
+////    public onResume(name: string) { }
+////}
+////class MyOtherEventManager {
+////    public onResume(name: string) { }
+////}
+verify.navigationItemsListCount(3, "onResume");
+verify.navigationItemsListCount(1, "onResume", undefined, test.marker("1").fileName);
+verify.navigationItemsListContains("onResume", "function", "onResume", "exact", test.marker("1").fileName);
+verify.navigationItemsListCount(2, "onResume", undefined, test.marker("2").fileName);

Original file line number	Diff line number	Diff line change
`@@ -592,9 +592,8 @@ namespace ts {`
`592`	`592`	`else {`
`593`	`593`	`declarations.push(functionDeclaration);`
`594`	`594`	`}`
`595`		`-`
`596`		`- forEachChild(node, visit);`
`597`	`595`	`}`
	`596`	`+ forEachChild(node, visit);`
`598`	`597`	`break;`
`599`	`598`
`600`	`599`	`case SyntaxKind.ClassDeclaration:`