Fix algorithm and include function expressions.

Previous algorithm would sort *after* adding to top-level nodes.
This was broken because top-level nodes were simply all in a flat array, so this would cause sorting among unrelated elements.
Now we collect all the nodes in a single logical level and sort them before adding them to topLevelNodes.

Author: Andy Hanson

src/harness/fourslash.ts

@@ -2058,15 +2058,24 @@ namespace FourSlash {
             }
         }
 
-        public printNavigationBar() {
+        public printNavigationBar(showChildItems = false) {
             const items = this.languageService.getNavigationBarItems(this.activeFile.fileName);
             const length = items && items.length;
 
             Harness.IO.log(`Navigation bar (${length} items)`);
 
             for (let i = 0; i < length; i++) {
                 const item = items[i];
-                Harness.IO.log(`name: ${item.text}, kind: ${item.kind}`);
+                const childrenText = showChildItems ? `, children: ${item.childItems.map(child => child.text)}` : "";
+                Harness.IO.log(`${strRepeat("  ", item.indent)}name: ${item.text}, kind: ${item.kind}${childrenText}`);
+            }
+
+            function strRepeat(str: string, times: number) {
+                let out = "";
+                for (let i = 0; i < times; i++) {
+                    out += str;
+                }
+                return out;
             }
         }
 
@@ -3267,8 +3276,8 @@ namespace FourSlashInterface {
             this.state.printNavigationItems(searchValue);
         }
 
-        public printNavigationBar() {
-            this.state.printNavigationBar();
+        public printNavigationBar(showChildItems = false) {
+            this.state.printNavigationBar(showChildItems);
         }
 
         public printReferences() {

src/services/navigationBar.ts

@@ -238,7 +238,7 @@ declare namespace FourSlashInterface {
         printBreakpointAtCurrentLocation(): void;
         printNameOrDottedNameSpans(pos: number): void;
         printErrorList(): void;
-        printNavigationBar(): void;
+        printNavigationBar(showChildItems?: boolean): void;
         printNavigationItems(searchValue?: string): void;
         printScriptLexicalStructureItems(): void;
         printReferences(): void;

tests/cases/fourslash/fourslash.ts

@@ -0,0 +1,42 @@
+/// <reference path="fourslash.ts" />
+
+////global.cls = class { };
+////(function() {
+////    const x = () => {
+////        // Presence of inner function causes x to be a top-level function.
+////        function xx() {}
+////    };
+////    const y = {
+////        // This is not a top-level function (contains nothing, but shows up in childItems of its parent.)
+////        foo: function() {}
+////    };
+////    (function nest() {
+////        function moreNest() {}
+////    })();
+////})();
+////(function() { // Different anonymous functions are not merged
+////    These will only show up as childItems.
+////    function z() {}
+////    console.log(function() {})
+////})
+////(function classes() {
+////    // Classes show up in top-level regardless of whether they have names or inner declarations.
+////    const cls2 = class { };
+////    console.log(class cls3 {});
+////    (class { });
+////})
+
+verify.navigationBarCount(21);
+verify.navigationBarIndex("<global>", 0);
+verify.navigationBarIndex("<function>", 1);
+verify.navigationBarIndex("x", 2);
+verify.navigationBarIndex("nest", 3);
+verify.navigationBarIndex("<function>", 4);
+verify.navigationBarIndex("global.cls", 5);
+verify.navigationBarIndex("classes", 6);
+verify.navigationBarIndex("cls2", 7);
+verify.navigationBarIndex("<class>", 8);
+verify.navigationBarIndex("cls3", 9);
+
+verify.navigationBarContains("global.cls", "class");
+

tests/cases/fourslash/navigationBarAnonymousDeclarationExpressions.ts

@@ -20,4 +20,4 @@ test.markers().forEach((marker) => {
     verify.navigationBarContains(marker.data.itemName, marker.data.kind, marker.fileName, marker.data.parentName);
 });
 
-verify.navigationBarCount(8); // 4 functions + global.  Note: there are 8 because of the functions show up at the top level and as child items.
+verify.navigationBarCount(11); // Includes many nested functions, with duplications as they appear both at top-level and as childItems

tests/cases/fourslash/navigationBarItemsFunctions.ts

@@ -9,4 +9,4 @@ test.markers().forEach((marker) => {
     verify.navigationBarContains(marker.data.itemName, marker.data.kind, marker.fileName, marker.data.parentName);
 });
 
-verify.navigationBarCount(3); // <global> and 'f'. 
+verify.navigationBarCount(4); // <global> with child 'f' and 'f' with child '<function>'.

tests/cases/fourslash/navigationBarItemsFunctionsBroken.ts

@@ -10,4 +10,4 @@ test.markers().forEach((marker) => {
     verify.navigationBarContains(marker.data.itemName, marker.data.kind, marker.fileName, marker.data.parentName);
 });
 
-verify.navigationBarCount(3); // <global> and 'f'
+verify.navigationBarCount(5); // <global> with children '<function>' and 'f', and 'f' with child '<function>'

tests/cases/fourslash/navigationBarItemsFunctionsBroken2.ts

@@ -1,4 +1,3 @@
-
 ////{| "itemName": "\"X.Y.Z\"", "kind": "module" |}
 ////declare module "X.Y.Z" {
 ////}