Merge pull request microsoft#10590 from Microsoft/navbar_fn_in_var

Andy · web-flow · commit 5f16a4823629 · 2016-09-01T11:17:22.000-07:00
Treat variable declaration as top-level if it has an important child.
diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts
@@ -466,6 +466,7 @@ namespace ts.NavigationBar {
                 case SyntaxKind.MethodDeclaration:
                 case SyntaxKind.GetAccessor:
                 case SyntaxKind.SetAccessor:
+                case SyntaxKind.VariableDeclaration:
                     return hasSomeImportantChild(item);
 
                 case SyntaxKind.ArrowFunction:
diff --git a/tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions.ts b/tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions.ts
@@ -90,6 +90,17 @@ verify.navigationBar([
         ],
         "indent": 2
     },
+    {
+        "text": "y",
+        "kind": "const",
+        "childItems": [
+            {
+                "text": "foo",
+                "kind": "function"
+            }
+        ],
+        "indent": 2
+    },
     {
         "text": "<function>",
         "kind": "function",
diff --git a/tests/cases/fourslash/navigationBarFunctionIndirectlyInVariableDeclaration.ts b/tests/cases/fourslash/navigationBarFunctionIndirectlyInVariableDeclaration.ts
@@ -0,0 +1,46 @@
+/// <reference path="fourslash.ts"/>
+
+////var a = {
+////    propA: function() {}
+////};
+////var b;
+////b = {
+////    propB: function() {}
+////};
+
+verify.navigationBar([
+  {
+    "text": "<global>",
+    "kind": "script",
+    "childItems": [
+      {
+        "text": "a",
+        "kind": "var"
+      },
+      {
+        "text": "b",
+        "kind": "var"
+      },
+      {
+        "text": "propB",
+        "kind": "function"
+      }
+    ]
+  },
+  {
+    "text": "a",
+    "kind": "var",
+    "childItems": [
+      {
+        "text": "propA",
+        "kind": "function"
+      }
+    ],
+    "indent": 1
+  },
+  {
+    "text": "propB",
+    "kind": "function",
+    "indent": 1
+  }
+]);
