From 109c05863ee95c19afabb1340006cca66c1828d4 Mon Sep 17 00:00:00 2001 From: Andy Hanson Date: Wed, 25 May 2016 07:49:56 -0700 Subject: [PATCH] Include modules as childItems in navigation bar --- src/services/navigationBar.ts | 44 ++++++++++--------- .../navbar_contains-no-duplicates.ts | 12 ++--- .../fourslash/navigationBarItemsItems.ts | 4 +- .../fourslash/navigationBarItemsItems2.ts | 2 +- .../navigationBarItemsItemsModuleVariables.ts | 4 +- .../fourslash/navigationBarItemsModules.ts | 19 ++++---- ...ationBarItemsMultilineStringIdentifiers.ts | 8 ++-- tests/cases/fourslash/server/navbar01.ts | 4 +- 8 files changed, 51 insertions(+), 46 deletions(-) diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts index cb81c398cb8..53b1ca0b02c 100644 --- a/src/services/navigationBar.ts +++ b/src/services/navigationBar.ts @@ -320,6 +320,10 @@ namespace ts.NavigationBar { case SyntaxKind.EnumMember: return createItem(node, getTextOfNode((node).name), ts.ScriptElementKind.memberVariableElement); + //move? + case SyntaxKind.ModuleDeclaration: + return createItem(node, getModuleName(node), ts.ScriptElementKind.moduleElement); + case SyntaxKind.CallSignature: return createItem(node, "()", ts.ScriptElementKind.callSignatureElement); @@ -433,26 +437,6 @@ namespace ts.NavigationBar { return undefined; - function getModuleName(moduleDeclaration: ModuleDeclaration): string { - // We want to maintain quotation marks. - if (isAmbientModule(moduleDeclaration)) { - return getTextOfNode(moduleDeclaration.name); - } - - // Otherwise, we need to aggregate each identifier to build up the qualified name. - const result: string[] = []; - - result.push(moduleDeclaration.name.text); - - while (moduleDeclaration.body && moduleDeclaration.body.kind === SyntaxKind.ModuleDeclaration) { - moduleDeclaration = moduleDeclaration.body; - - result.push(moduleDeclaration.name.text); - } - - return result.join("."); - } - function createModuleItem(node: ModuleDeclaration): NavigationBarItem { const moduleName = getModuleName(node); @@ -587,6 +571,26 @@ namespace ts.NavigationBar { } } + function getModuleName(moduleDeclaration: ModuleDeclaration): string { + // We want to maintain quotation marks. + if (isAmbientModule(moduleDeclaration)) { + return getTextOfNode(moduleDeclaration.name); + } + + // Otherwise, we need to aggregate each identifier to build up the qualified name. + const result: string[] = []; + + result.push(moduleDeclaration.name.text); + + while (moduleDeclaration.body && moduleDeclaration.body.kind === SyntaxKind.ModuleDeclaration) { + moduleDeclaration = moduleDeclaration.body; + + result.push(moduleDeclaration.name.text); + } + + return result.join("."); + } + function removeComputedProperties(node: EnumDeclaration): Declaration[] { return filter(node.members, member => member.name === undefined || member.name.kind !== SyntaxKind.ComputedPropertyName); } diff --git a/tests/cases/fourslash/navbar_contains-no-duplicates.ts b/tests/cases/fourslash/navbar_contains-no-duplicates.ts index ec86e4b2f20..380b9be04f0 100644 --- a/tests/cases/fourslash/navbar_contains-no-duplicates.ts +++ b/tests/cases/fourslash/navbar_contains-no-duplicates.ts @@ -1,6 +1,6 @@ /// -//// {| "itemName": "Windows", "kind": "module", "parentName": "" |}declare module Windows { -//// {| "itemName": "Foundation", "kind": "module", "parentName": "" |}export module Foundation { +//// {| "itemName": "Windows", "kind": "module", "parentName": "" |}declare module Windows { +//// {| "itemName": "Foundation", "kind": "module", "parentName": "Windows" |}export module Foundation { //// export var {| "itemName": "A", "kind": "var" |}A; //// {| "itemName": "Test", "kind": "class" |}export class Test { //// {| "itemName": "wow", "kind": "method" |}public wow(); @@ -8,8 +8,8 @@ //// } //// } //// -//// {| "itemName": "Windows", "kind": "module", "parentName": "", "isAdditionalRange": true |}declare module Windows { -//// {| "itemName": "Foundation", "kind": "module", "parentName": "", "isAdditionalRange": true |}export module Foundation { +//// {| "itemName": "Windows", "kind": "module", "parentName": "", "isAdditionalRange": true |}declare module Windows { +//// {| "itemName": "Foundation", "kind": "module", "parentName": "Windows", "isAdditionalRange": true |}export module Foundation { //// export var {| "itemName": "B", "kind": "var" |}B; //// {| "itemName": "Test", "kind": "module" |}export module Test { //// {| "itemName": "Boom", "kind": "function" |}export function Boom(): number; @@ -23,7 +23,7 @@ //// } //// } //// -//// {| "itemName": "ABC", "kind": "module", "parentName": "" |}module ABC { +//// {| "itemName": "ABC", "kind": "module", "parentName": "" |}module ABC { //// export var {| "itemName": "x", "kind": "var" |}x = 3; //// } @@ -38,4 +38,4 @@ test.markers().forEach(marker => { marker.position); } }); -verify.navigationBarCount(12); \ No newline at end of file +verify.navigationBarCount(17); \ No newline at end of file diff --git a/tests/cases/fourslash/navigationBarItemsItems.ts b/tests/cases/fourslash/navigationBarItemsItems.ts index 5cae68b1194..582aad019b9 100644 --- a/tests/cases/fourslash/navigationBarItemsItems.ts +++ b/tests/cases/fourslash/navigationBarItemsItems.ts @@ -10,7 +10,7 @@ ////} //// /////// Module -////{| "itemName": "Shapes", "kind": "module", "parentName": "" |}module Shapes { +////{| "itemName": "Shapes", "kind": "module", "parentName": "" |}module Shapes { //// //// // Class //// {| "itemName": "Point", "kind": "class", "parentName": "" |}export class Point implements IPoint { @@ -49,4 +49,4 @@ test.markers().forEach((marker) => { } }); -verify.navigationBarCount(24); +verify.navigationBarCount(25); diff --git a/tests/cases/fourslash/navigationBarItemsItems2.ts b/tests/cases/fourslash/navigationBarItemsItems2.ts index d4ffde54051..013f27b4d71 100644 --- a/tests/cases/fourslash/navigationBarItemsItems2.ts +++ b/tests/cases/fourslash/navigationBarItemsItems2.ts @@ -8,5 +8,5 @@ edit.insertLine("module A"); edit.insert("export class "); // should not crash -verify.navigationBarCount(2); +verify.navigationBarCount(4); diff --git a/tests/cases/fourslash/navigationBarItemsItemsModuleVariables.ts b/tests/cases/fourslash/navigationBarItemsItemsModuleVariables.ts index afc1acfb9cb..5429011888c 100644 --- a/tests/cases/fourslash/navigationBarItemsItemsModuleVariables.ts +++ b/tests/cases/fourslash/navigationBarItemsItemsModuleVariables.ts @@ -22,9 +22,9 @@ goTo.marker("file1"); verify.navigationBarContains("Module1", "module"); verify.navigationBarContains("x", "var"); // nothing else should show up -verify.navigationBarCount(2); +verify.navigationBarCount(4); // , its child, Module1, its child goTo.marker("file2"); verify.navigationBarContains("Module1.SubModule", "module"); verify.navigationBarContains("y", "var"); -verify.navigationBarCount(2); +verify.navigationBarCount(4); diff --git a/tests/cases/fourslash/navigationBarItemsModules.ts b/tests/cases/fourslash/navigationBarItemsModules.ts index 895a9e23a06..237ec8eb275 100644 --- a/tests/cases/fourslash/navigationBarItemsModules.ts +++ b/tests/cases/fourslash/navigationBarItemsModules.ts @@ -1,35 +1,36 @@ +/// -////{| "itemName": "\"X.Y.Z\"", "kind": "module" |} +////{| "itemName": "\"X.Y.Z\"", "kind": "module", "parentName": "" |} ////declare module "X.Y.Z" { ////} //// -////{| "itemName": "'X2.Y2.Z2'", "kind": "module" |} +////{| "itemName": "'X2.Y2.Z2'", "kind": "module", "parentName": "" |} ////declare module 'X2.Y2.Z2' { ////} //// -////{| "itemName": "A.B.C", "kind": "module" |} +////{| "itemName": "A.B.C", "kind": "module", "parentName": "" |} ////module A.B.C { //// {| "itemName": "x", "kind": "var", "parentName": "A.B.C" |} //// export var x; ////} //// -////{| "itemName": "A.B", "kind": "module" |} +////{| "itemName": "A.B", "kind": "module", "parentName": "" |} ////module A.B { //// {| "itemName": "y", "kind": "var", "parentName": "A.B" |} //// export var y; ////} //// -////{| "itemName": "A", "kind": "module" |} +////{| "itemName": "A", "kind": "module", "parentName": "" |} ////module A { //// {| "itemName": "z", "kind": "var", "parentName": "A" |} //// export var z; ////} //// -////{| "itemName": "A", "kind": "module" |} +////{| "itemName": "A", "kind": "module", "parentName": "" |} ////module A { -//// {| "itemName": "B", "kind": "module", "parentName": "" |} +//// {| "itemName": "B", "kind": "module", "parentName": "A" |} //// module B { -//// {| "itemName": "C", "kind": "module", "parentName": "" |} +//// {| "itemName": "C", "kind": "module", "parentName": "B" |} //// module C { //// {| "itemName": "x", "kind": "var", "parentName": "C" |} //// declare var x; @@ -45,4 +46,4 @@ test.markers().forEach((marker) => { /// We have 8 module keywords, and 4 var keywords. /// The declarations of A.B.C.x do not get merged, so the 4 vars are independent. /// The two 'A' modules, however, do get merged, so in reality we have 7 modules. -verify.navigationBarCount(11); +verify.navigationBarCount(19); diff --git a/tests/cases/fourslash/navigationBarItemsMultilineStringIdentifiers.ts b/tests/cases/fourslash/navigationBarItemsMultilineStringIdentifiers.ts index 8856c4c044a..fc6eeb4dcec 100644 --- a/tests/cases/fourslash/navigationBarItemsMultilineStringIdentifiers.ts +++ b/tests/cases/fourslash/navigationBarItemsMultilineStringIdentifiers.ts @@ -1,13 +1,13 @@ -////{| "itemName": "\"Multiline\\r\\nMadness\"", "kind": "module" |} +////{| "itemName": "\"Multiline\\r\\nMadness\"", "kind": "module", "parentName": "" |} ////declare module "Multiline\r\nMadness" { ////} //// -////{| "itemName": "\"Multiline\\\nMadness\"", "kind": "module" |} +////{| "itemName": "\"Multiline\\\nMadness\"", "kind": "module", "parentName": "" |} ////declare module "Multiline\ ////Madness" { ////} -////{| "itemName": "\"MultilineMadness\"", "kind": "module" |} +////{| "itemName": "\"MultilineMadness\"", "kind": "module", "parentName": "" |} ////declare module "MultilineMadness" {} //// ////{| "itemName": "Foo", "kind": "interface" |} @@ -38,4 +38,4 @@ test.markers().forEach((marker) => { verify.navigationBarContains(marker.data.itemName, marker.data.kind, marker.fileName, marker.data.parentName); }); -verify.navigationBarCount(9); // interface w/ 2 properties, class w/ 2 properties, 3 modules \ No newline at end of file +verify.navigationBarCount(13); \ No newline at end of file diff --git a/tests/cases/fourslash/server/navbar01.ts b/tests/cases/fourslash/server/navbar01.ts index e4e2b699be5..79b0dd3c1ab 100644 --- a/tests/cases/fourslash/server/navbar01.ts +++ b/tests/cases/fourslash/server/navbar01.ts @@ -10,7 +10,7 @@ ////} //// /////// Module -////{| "itemName": "Shapes", "kind": "module", "parentName": "" |}module Shapes { +////{| "itemName": "Shapes", "kind": "module", "parentName": "" |}module Shapes { //// //// // Class //// {| "itemName": "Point", "kind": "class", "parentName": "" |}export class Point implements IPoint { @@ -49,4 +49,4 @@ test.markers().forEach((marker) => { } }); -verify.navigationBarCount(24); +verify.navigationBarCount(25);