microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-11 16:38:46 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Include enums in childItems in navigation bar

Browse Source
This commit is contained in:
Andy Hanson
2016-05-24 05:58:14 -07:00
parent 27292e4292
commit 11d51867f2
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/services/navigationBar.ts
View File

@@ -314,6 +314,9 @@ namespace ts.NavigationBar {
case SyntaxKind.IndexSignature:
return createItem(node, "[]", ts.ScriptElementKind.indexSignatureElement);
case SyntaxKind.EnumDeclaration:
return createItem(node, getTextOfNode((<EnumDeclaration>node).name), ts.ScriptElementKind.enumElement);
case SyntaxKind.EnumMember:
return createItem(node, getTextOfNode((<EnumMember>node).name), ts.ScriptElementKind.memberVariableElement);

6
tests/cases/fourslash/navigationBarItemsInsideMethodsAndConstructors.ts
View File

@@ -9,7 +9,7 @@
//// {| "itemName": "LocalInterfaceInConstrcutor", "kind": "interface", "parentName": ""|}interface LocalInterfaceInConstrcutor {
//// }
////
//// enum LocalEnumInConstructor {
//// {| "itemName": "LocalEnumInConstructor", "kind": "enum", "parentName": "constructor"|}enum LocalEnumInConstructor {
//// {| "itemName": "LocalEnumMemberInConstructor", "kind": "property", "parentName": "LocalEnumInConstructor"|}LocalEnumMemberInConstructor,
//// }
//// }
@@ -24,7 +24,7 @@
//// {| "itemName": "LocalInterfaceInMethod", "kind": "interface", "parentName": ""|}interface LocalInterfaceInMethod {
//// }
////
//// {| "itemName": "LocalEnumInMethod", "kind": "enum", "parentName": ""|}enum LocalEnumInMethod {
//// {| "itemName": "LocalEnumInMethod", "kind": "enum", "parentName": "method"|}enum LocalEnumInMethod {
//// {| "itemName": "LocalEnumMemberInMethod", "kind": "property", "parentName": "LocalEnumInMethod"|}LocalEnumMemberInMethod,
//// }
//// }
@@ -39,4 +39,4 @@ test.markers().forEach((marker) => {
});
// no other items
verify.navigationBarCount(17);
verify.navigationBarCount(19);

4
tests/cases/fourslash/navigationBarItemsItems.ts
View File

@@ -32,7 +32,7 @@
//// {| "itemName": "getOrigin", "kind": "method", "parentName": "Point" |}private static getOrigin() { return Point.origin;}
//// }
////
//// {| "itemName": "Values", "kind": "enum", "parentName": "" |}enum Values {
//// {| "itemName": "Values", "kind": "enum", "parentName": "Shapes" |}enum Values {
//// value1,
//// {| "itemName": "value2", "kind": "property", "parentName": "Values" |}value2,
//// value3,
@@ -49,4 +49,4 @@ test.markers().forEach((marker) => {
}
});
verify.navigationBarCount(23);
verify.navigationBarCount(24);

4
tests/cases/fourslash/navigationBarItemsSymbols3.ts
View File

@@ -1,6 +1,6 @@
/// <reference path="fourslash.ts"/>
////{| "itemName": "E", "kind": "enum", "parentName": "" |}
////{| "itemName": "E", "kind": "enum", "parentName": "<global>" |}
////enum E {
//// // No nav bar entry for this
//// [Symbol.isRegExp] = 0
@@ -10,4 +10,4 @@ test.markers().forEach(marker => {
verify.navigationBarContains(marker.data.itemName, marker.data.kind, marker.fileName, marker.data.parentName);
});
verify.navigationBarCount(test.markers().length);
verify.navigationBarCount(3); // <global> and E appearing both toplevel and under <global>

4
tests/cases/fourslash/server/navbar01.ts
View File

@@ -32,7 +32,7 @@
//// {| "itemName": "getOrigin", "kind": "method", "parentName": "Point" |}private static getOrigin() { return Point.origin;}
//// }
////
//// {| "itemName": "Values", "kind": "enum", "parentName": "" |}enum Values {
//// {| "itemName": "Values", "kind": "enum", "parentName": "Shapes" |}enum Values {
//// value1,
//// {| "itemName": "value2", "kind": "property", "parentName": "Values" |}value2,
//// value3,
@@ -49,4 +49,4 @@ test.markers().forEach((marker) => {
}
});
verify.navigationBarCount(23);
verify.navigationBarCount(24);