Refactor navigation bar, fixing many bugs along the way

Andy Hanson · Andy Hanson · commit 5c6203ca77b9 · 2016-05-27T14:07:24.000-07:00
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -1994,6 +1994,7 @@ namespace FourSlash {
 
         public printNavigationBar(showChildItems = false) {
             const items = this.languageService.getNavigationBarItems(this.activeFile.fileName);
+
             const length = items && items.length;
 
             Harness.IO.log(`Navigation bar (${length} items)`);
diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -6867,7 +6867,7 @@ namespace ts {
         function getNavigationBarItems(fileName: string): NavigationBarItem[] {
             const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
 
-            return NavigationBar.getNavigationBarItems(sourceFile, host.getCompilationSettings());
+            return NavigationBar.getNavigationBarItems(sourceFile);
         }
 
         function getSemanticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[] {
diff --git a/tests/cases/fourslash/navbar_contains-no-duplicates.ts b/tests/cases/fourslash/navbar_contains-no-duplicates.ts
@@ -95,13 +95,13 @@ verify.navigationBar([
                 "kindModifiers": "export,declare"
             },
             {
-                "text": "Test",
-                "kind": "class",
+                "text": "B",
+                "kind": "var",
                 "kindModifiers": "export,declare"
             },
             {
-                "text": "B",
-                "kind": "var",
+                "text": "Test",
+                "kind": "class",
                 "kindModifiers": "export,declare"
             },
             {
diff --git a/tests/cases/fourslash/navigationBarAnonymousDeclarationExpressions.ts b/tests/cases/fourslash/navigationBarAnonymousDeclarationExpressions.ts
@@ -144,5 +144,4 @@ verify.navigationBar([
         "kind": "class",
         "indent": 1
     }
-]
-);
+]);
diff --git a/tests/cases/fourslash/navigationBarGetterAndSetter.ts b/tests/cases/fourslash/navigationBarGetterAndSetter.ts
@@ -0,0 +1,48 @@
+/// <reference path="fourslash.ts" />
+
+////class X {
+////    get x() {}
+////    set x(value) {
+////        // Inner declaration should make the setter top-level.
+////        function f() {}
+////    }
+////}
+
+verify.navigationBar([
+    {
+        "text": "<global>",
+        "kind": "module",
+        "childItems": [
+            {
+                "text": "X",
+                "kind": "class"
+            }
+        ]
+    },
+    {
+        "text": "X",
+        "kind": "class",
+        "childItems": [
+            {
+                "text": "x",
+                "kind": "getter"
+            },
+            {
+                "text": "x",
+                "kind": "setter"
+            }
+        ],
+        "indent": 1
+    },
+    {
+        "text": "x",
+        "kind": "setter",
+        "childItems": [
+            {
+                "text": "f",
+                "kind": "function"
+            }
+        ],
+        "indent": 2
+    }
+]);
diff --git a/tests/cases/fourslash/navigationBarItemsFunctionsBroken.ts b/tests/cases/fourslash/navigationBarItemsFunctionsBroken.ts
@@ -1,7 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
 ////function f() {
-////    function;
+////    function; // This is not included as a navigation item, but it causes 'f' to be considered top-level.
 ////}
 
 verify.navigationBar([
diff --git a/tests/cases/fourslash/navigationBarItemsInsideMethodsAndConstructors.ts b/tests/cases/fourslash/navigationBarItemsInsideMethodsAndConstructors.ts
@@ -76,17 +76,17 @@ verify.navigationBar([
                 "kind": "property"
             }
         ],
-        "indent": 2
+        "indent": 3
     },
     {
         "text": "LocalFunctionInConstructor",
         "kind": "function",
-        "indent": 2
+        "indent": 3
     },
     {
         "text": "LocalInterfaceInConstrcutor",
         "kind": "interface",
-        "indent": 2
+        "indent": 3
     },
     {
         "text": "method",
@@ -116,7 +116,7 @@ verify.navigationBar([
                 "kind": "property"
             }
         ],
-        "indent": 2
+        "indent": 3
     },
     {
         "text": "LocalFunctionInMethod",
@@ -127,11 +127,11 @@ verify.navigationBar([
                 "kind": "function"
             }
         ],
-        "indent": 2
+        "indent": 3
     },
     {
         "text": "LocalInterfaceInMethod",
         "kind": "interface",
-        "indent": 2
+        "indent": 3
     }
 ]);
diff --git a/tests/cases/fourslash/navigationBarItemsMissingName1.ts b/tests/cases/fourslash/navigationBarItemsMissingName1.ts
@@ -3,7 +3,7 @@
 ////    foo() {}
 ////}
 
-verify.navigationBar( [
+verify.navigationBar([
   {
     "text": "\"navigationBarItemsMissingName1\"",
     "kind": "module",
diff --git a/tests/cases/fourslash/navigationBarItemsMissingName2.ts b/tests/cases/fourslash/navigationBarItemsMissingName2.ts
@@ -7,25 +7,25 @@
 
 // Anonymous classes are still included.
 verify.navigationBar([
-  {
-    "text": "<global>",
-    "kind": "module",
-    "childItems": [
-      {
+    {
+        "text": "<global>",
+        "kind": "module",
+        "childItems": [
+            {
+                "text": "<class>",
+                "kind": "class"
+            }
+        ]
+    },
+    {
         "text": "<class>",
-        "kind": "class"
-      }
-    ]
-  },
-  {
-    "text": "<class>",
-    "kind": "class",
-    "childItems": [
-      {
-        "text": "foo",
-        "kind": "method"
-      }
-    ],
-    "indent": 1
-  }
+        "kind": "class",
+        "childItems": [
+            {
+                "text": "foo",
+                "kind": "method"
+            }
+        ],
+        "indent": 1
+    }
 ]);
diff --git a/tests/cases/fourslash/navigationBarItemsModules.ts b/tests/cases/fourslash/navigationBarItemsModules.ts
diff --git a/tests/cases/fourslash/navigationBarMerging.ts b/tests/cases/fourslash/navigationBarMerging.ts
diff --git a/tests/cases/fourslash/navigationBarVariables.ts b/tests/cases/fourslash/navigationBarVariables.ts

Original file line number	Diff line number	Diff line change
`@@ -6867,7 +6867,7 @@ namespace ts {`
`6867`	`6867`	`function getNavigationBarItems(fileName: string): NavigationBarItem[] {`
`6868`	`6868`	`const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);`
`6869`	`6869`
`6870`		`- return NavigationBar.getNavigationBarItems(sourceFile, host.getCompilationSettings());`
	`6870`	`+ return NavigationBar.getNavigationBarItems(sourceFile);`
`6871`	`6871`	`}`
`6872`	`6872`
`6873`	`6873`	`function getSemanticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[] {`
Original file line number	Diff line number	Diff line change
`@@ -95,13 +95,13 @@ verify.navigationBar([`
`95`	`95`	`"kindModifiers": "export,declare"`
`96`	`96`	`},`
`97`	`97`	`{`
`98`		`- "text": "Test",`
`99`		`- "kind": "class",`
	`98`	`+ "text": "B",`
	`99`	`+ "kind": "var",`
`100`	`100`	`"kindModifiers": "export,declare"`
`101`	`101`	`},`
`102`	`102`	`{`
`103`		`- "text": "B",`
`104`		`- "kind": "var",`
	`103`	`+ "text": "Test",`
	`104`	`+ "kind": "class",`
`105`	`105`	`"kindModifiers": "export,declare"`
`106`	`106`	`},`
`107`	`107`	`{`
Original file line number	Diff line number	Diff line change
`@@ -144,5 +144,4 @@ verify.navigationBar([`
`144`	`144`	`"kind": "class",`
`145`	`145`	`"indent": 1`
`146`	`146`	`}`
`147`		`-]`
`148`		`-);`
	`147`	`+]);`
Original file line number	Diff line number	Diff line change
`@@ -76,17 +76,17 @@ verify.navigationBar([`
`76`	`76`	`"kind": "property"`
`77`	`77`	`}`
`78`	`78`	`],`
`79`		`- "indent": 2`
	`79`	`+ "indent": 3`
`80`	`80`	`},`
`81`	`81`	`{`
`82`	`82`	`"text": "LocalFunctionInConstructor",`
`83`	`83`	`"kind": "function",`
`84`		`- "indent": 2`
	`84`	`+ "indent": 3`
`85`	`85`	`},`
`86`	`86`	`{`
`87`	`87`	`"text": "LocalInterfaceInConstrcutor",`
`88`	`88`	`"kind": "interface",`
`89`		`- "indent": 2`
	`89`	`+ "indent": 3`
`90`	`90`	`},`
`91`	`91`	`{`
`92`	`92`	`"text": "method",`
`@@ -116,7 +116,7 @@ verify.navigationBar([`
`116`	`116`	`"kind": "property"`
`117`	`117`	`}`
`118`	`118`	`],`
`119`		`- "indent": 2`
	`119`	`+ "indent": 3`
`120`	`120`	`},`
`121`	`121`	`{`
`122`	`122`	`"text": "LocalFunctionInMethod",`
`@@ -127,11 +127,11 @@ verify.navigationBar([`
`127`	`127`	`"kind": "function"`
`128`	`128`	`}`
`129`	`129`	`],`
`130`		`- "indent": 2`
	`130`	`+ "indent": 3`
`131`	`131`	`},`
`132`	`132`	`{`
`133`	`133`	`"text": "LocalInterfaceInMethod",`
`134`	`134`	`"kind": "interface",`
`135`		`- "indent": 2`
	`135`	`+ "indent": 3`
`136`	`136`	`}`
`137`	`137`	`]);`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`//// foo() {}`
`4`	`4`	`////}`
`5`	`5`
`6`		`-verify.navigationBar( [`
	`6`	`+verify.navigationBar([`
`7`	`7`	`{`
`8`	`8`	`"text": "\"navigationBarItemsMissingName1\"",`
`9`	`9`	`"kind": "module",`