Merge pull request #8811 from Microsoft/navbar_class_child_item

Include classes as childItems in navigation bar

Author: Andy

src/services/navigationBar.ts

@@ -333,6 +333,9 @@ namespace ts.NavigationBar {
                 case SyntaxKind.PropertySignature:
                     return createItem(node, getTextOfNode((<PropertyDeclaration>node).name), ts.ScriptElementKind.memberVariableElement);
 
+                case SyntaxKind.ClassDeclaration:
+                    return createItem(node, getTextOfNode((<ClassDeclaration>node).name), ts.ScriptElementKind.classElement);
+
                 case SyntaxKind.FunctionDeclaration:
                     return createItem(node, getTextOfNode((<FunctionLikeDeclaration>node).name), ts.ScriptElementKind.functionElement);
 

tests/cases/fourslash/getNavigationBarItems.ts

@@ -5,7 +5,7 @@
 ////    ["bar"]: string;
 ////}
 
-verify.navigationBarCount(3);
+verify.navigationBarCount(5);
 verify.navigationBarContains("C", "class");
 verify.navigationBarChildItem("C", "[\"bar\"]", "property");
 verify.navigationBarChildItem("C", "foo", "property");

tests/cases/fourslash/navbar_contains-no-duplicates.ts

@@ -2,7 +2,7 @@
 //// {| "itemName": "Windows", "kind": "module", "parentName": "" |}declare module Windows {
 ////     {| "itemName": "Foundation", "kind": "module", "parentName": "" |}export module Foundation {
 ////         export var {| "itemName": "A", "kind": "var" |}A;
-////         {| "itemName": "Test", "kind": "class" |}export class Test {
+////         {| "itemName": "Test", "kind": "class", "parentName": "Foundation" |}export class Test {
 ////             {| "itemName": "wow", "kind": "method" |}public wow();
 ////         }
 ////     }
@@ -38,4 +38,4 @@ test.markers().forEach(marker => {
             marker.position);
     }
 });
-verify.navigationBarCount(12);
+verify.navigationBarCount(15);

tests/cases/fourslash/navigationBarItemsBindingPatternsInConstructor.ts

@@ -11,4 +11,4 @@
 ////    }
 ////}
 
-verify.navigationBarCount(6); // 2x(class + field + constructor)
+verify.navigationBarCount(9); // global + 2 children + 2x(class + field + constructor)

tests/cases/fourslash/navigationBarItemsEmptyConstructors.ts

@@ -9,4 +9,4 @@ verify.navigationBarContains("Test", "class");
 verify.navigationBarContains("constructor", "constructor");
 
 // no other items
-verify.navigationBarCount(2);
+verify.navigationBarCount(4); // global + 1 child, Test + 1 child

tests/cases/fourslash/navigationBarItemsInsideMethodsAndConstructors.ts

@@ -39,4 +39,4 @@ test.markers().forEach((marker) => {
 });
 
 // no other items
-verify.navigationBarCount(21);
+verify.navigationBarCount(23);

tests/cases/fourslash/navigationBarItemsItems.ts

@@ -13,7 +13,7 @@
 ////{| "itemName": "Shapes", "kind": "module", "parentName": "" |}module Shapes {
 ////
 ////    // Class
-////    {| "itemName": "Point", "kind": "class", "parentName": "" |}export class Point implements IPoint {
+////    {| "itemName": "Point", "kind": "class", "parentName": "Shapes" |}export class Point implements IPoint {
 ////        {| "itemName": "constructor", "kind": "constructor", "parentName": "Point" |}constructor (public x: number, public y: number) { }
 ////
 ////        // Instance member
@@ -49,4 +49,4 @@ test.markers().forEach((marker) => {
     }
 });
 
-verify.navigationBarCount(25);
+verify.navigationBarCount(26);

tests/cases/fourslash/navigationBarItemsItemsExternalModules.ts

@@ -1,11 +1,11 @@
 /// <reference path="fourslash.ts"/>
 
-////{| "itemName": "Bar", "kind": "class" |}export class Bar {
+////{| "itemName": "Bar", "kind": "class", "parentName": "\"navigationBarItemsItemsExternalModules\"" |}export class Bar {
 ////    {| "itemName": "s", "kind": "property", "parentName": "Bar" |}public s: string;
 ////}
 
 test.markers().forEach((marker) => {
     verify.navigationBarContains(marker.data.itemName, marker.data.kind, marker.fileName, marker.data.parentName);
 });
 
-verify.navigationBarCount(2); // external module node + class + property
+verify.navigationBarCount(4); // external module node + class + property

tests/cases/fourslash/navigationBarItemsItemsExternalModules2.ts

@@ -1,7 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
 // @Filename: test/file.ts
-////{| "itemName": "Bar", "kind": "class" |}export class Bar {
+////{| "itemName": "Bar", "kind": "class", "parentName": "\"file\"" |}export class Bar {
 ////    {| "itemName": "s", "kind": "property", "parentName": "Bar" |}public s: string;
 ////}
 ////{| "itemName": "\"file\"", "kind": "module" |}
@@ -12,4 +12,4 @@ test.markers().forEach((marker) => {
     verify.navigationBarContains(marker.data.itemName, marker.data.kind, marker.fileName, marker.data.parentName);
 });
 
-verify.navigationBarCount(4); // external module node + variable in module + class + property
+verify.navigationBarCount(5); // external module node + variable in module + class + property

tests/cases/fourslash/navigationBarItemsItemsExternalModules3.ts

@@ -1,7 +1,7 @@
 /// <reference path="fourslash.ts"/>
 
 // @Filename: test/my fil"e.ts
-////{| "itemName": "Bar", "kind": "class" |}export class Bar {
+////{| "itemName": "Bar", "kind": "class", "parentName": "\"my fil\\\"e\"" |}export class Bar {
 ////    {| "itemName": "s", "kind": "property", "parentName": "Bar" |}public s: string;
 ////}
 ////{| "itemName": "\"my fil\\\"e\"", "kind": "module" |}
@@ -12,4 +12,4 @@ test.markers().forEach((marker) => {
     verify.navigationBarContains(marker.data.itemName, marker.data.kind, marker.fileName, marker.data.parentName);
 });
 
-verify.navigationBarCount(4); // external module node + variable in module + class + property
+verify.navigationBarCount(5); // external module node + 2 children + class + property