Skip to content

Commit 109c058

Browse files
author
Andy Hanson
committed
Include modules as childItems in navigation bar
1 parent 7173fa8 commit 109c058

8 files changed

Lines changed: 51 additions & 46 deletions

‎src/services/navigationBar.ts‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,10 @@ namespace ts.NavigationBar {
320320
case SyntaxKind.EnumMember:
321321
return createItem(node, getTextOfNode((<EnumMember>node).name), ts.ScriptElementKind.memberVariableElement);
322322

323+
//move?
324+
case SyntaxKind.ModuleDeclaration:
325+
return createItem(node, getModuleName(<ModuleDeclaration>node), ts.ScriptElementKind.moduleElement);
326+
323327
case SyntaxKind.CallSignature:
324328
return createItem(node, "()", ts.ScriptElementKind.callSignatureElement);
325329

@@ -433,26 +437,6 @@ namespace ts.NavigationBar {
433437

434438
return undefined;
435439

436-
function getModuleName(moduleDeclaration: ModuleDeclaration): string {
437-
// We want to maintain quotation marks.
438-
if (isAmbientModule(moduleDeclaration)) {
439-
return getTextOfNode(moduleDeclaration.name);
440-
}
441-
442-
// Otherwise, we need to aggregate each identifier to build up the qualified name.
443-
const result: string[] = [];
444-
445-
result.push(moduleDeclaration.name.text);
446-
447-
while (moduleDeclaration.body && moduleDeclaration.body.kind === SyntaxKind.ModuleDeclaration) {
448-
moduleDeclaration = <ModuleDeclaration>moduleDeclaration.body;
449-
450-
result.push(moduleDeclaration.name.text);
451-
}
452-
453-
return result.join(".");
454-
}
455-
456440
function createModuleItem(node: ModuleDeclaration): NavigationBarItem {
457441
const moduleName = getModuleName(node);
458442

@@ -587,6 +571,26 @@ namespace ts.NavigationBar {
587571
}
588572
}
589573

574+
function getModuleName(moduleDeclaration: ModuleDeclaration): string {
575+
// We want to maintain quotation marks.
576+
if (isAmbientModule(moduleDeclaration)) {
577+
return getTextOfNode(moduleDeclaration.name);
578+
}
579+
580+
// Otherwise, we need to aggregate each identifier to build up the qualified name.
581+
const result: string[] = [];
582+
583+
result.push(moduleDeclaration.name.text);
584+
585+
while (moduleDeclaration.body && moduleDeclaration.body.kind === SyntaxKind.ModuleDeclaration) {
586+
moduleDeclaration = <ModuleDeclaration>moduleDeclaration.body;
587+
588+
result.push(moduleDeclaration.name.text);
589+
}
590+
591+
return result.join(".");
592+
}
593+
590594
function removeComputedProperties(node: EnumDeclaration): Declaration[] {
591595
return filter<Declaration>(node.members, member => member.name === undefined || member.name.kind !== SyntaxKind.ComputedPropertyName);
592596
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/// <reference path="fourslash.ts" />
2-
//// {| "itemName": "Windows", "kind": "module", "parentName": "" |}declare module Windows {
3-
//// {| "itemName": "Foundation", "kind": "module", "parentName": "" |}export module Foundation {
2+
//// {| "itemName": "Windows", "kind": "module", "parentName": "<global>" |}declare module Windows {
3+
//// {| "itemName": "Foundation", "kind": "module", "parentName": "Windows" |}export module Foundation {
44
//// export var {| "itemName": "A", "kind": "var" |}A;
55
//// {| "itemName": "Test", "kind": "class" |}export class Test {
66
//// {| "itemName": "wow", "kind": "method" |}public wow();
77
//// }
88
//// }
99
//// }
1010
////
11-
//// {| "itemName": "Windows", "kind": "module", "parentName": "", "isAdditionalRange": true |}declare module Windows {
12-
//// {| "itemName": "Foundation", "kind": "module", "parentName": "", "isAdditionalRange": true |}export module Foundation {
11+
//// {| "itemName": "Windows", "kind": "module", "parentName": "<global>", "isAdditionalRange": true |}declare module Windows {
12+
//// {| "itemName": "Foundation", "kind": "module", "parentName": "Windows", "isAdditionalRange": true |}export module Foundation {
1313
//// export var {| "itemName": "B", "kind": "var" |}B;
1414
//// {| "itemName": "Test", "kind": "module" |}export module Test {
1515
//// {| "itemName": "Boom", "kind": "function" |}export function Boom(): number;
@@ -23,7 +23,7 @@
2323
//// }
2424
//// }
2525
////
26-
//// {| "itemName": "ABC", "kind": "module", "parentName": "" |}module ABC {
26+
//// {| "itemName": "ABC", "kind": "module", "parentName": "<global>" |}module ABC {
2727
//// export var {| "itemName": "x", "kind": "var" |}x = 3;
2828
//// }
2929

@@ -38,4 +38,4 @@ test.markers().forEach(marker => {
3838
marker.position);
3939
}
4040
});
41-
verify.navigationBarCount(12);
41+
verify.navigationBarCount(17);

‎tests/cases/fourslash/navigationBarItemsItems.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
////}
1111
////
1212
/////// Module
13-
////{| "itemName": "Shapes", "kind": "module", "parentName": "" |}module Shapes {
13+
////{| "itemName": "Shapes", "kind": "module", "parentName": "<global>" |}module Shapes {
1414
////
1515
//// // Class
1616
//// {| "itemName": "Point", "kind": "class", "parentName": "" |}export class Point implements IPoint {
@@ -49,4 +49,4 @@ test.markers().forEach((marker) => {
4949
}
5050
});
5151

52-
verify.navigationBarCount(24);
52+
verify.navigationBarCount(25);

‎tests/cases/fourslash/navigationBarItemsItems2.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ edit.insertLine("module A");
88
edit.insert("export class ");
99

1010
// should not crash
11-
verify.navigationBarCount(2);
11+
verify.navigationBarCount(4);
1212

‎tests/cases/fourslash/navigationBarItemsItemsModuleVariables.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ goTo.marker("file1");
2222
verify.navigationBarContains("Module1", "module");
2323
verify.navigationBarContains("x", "var");
2424
// nothing else should show up
25-
verify.navigationBarCount(2);
25+
verify.navigationBarCount(4); // <global>, its child, Module1, its child
2626

2727
goTo.marker("file2");
2828
verify.navigationBarContains("Module1.SubModule", "module");
2929
verify.navigationBarContains("y", "var");
30-
verify.navigationBarCount(2);
30+
verify.navigationBarCount(4);

‎tests/cases/fourslash/navigationBarItemsModules.ts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,36 @@
1+
/// <reference path="fourslash.ts"/>
12

2-
////{| "itemName": "\"X.Y.Z\"", "kind": "module" |}
3+
////{| "itemName": "\"X.Y.Z\"", "kind": "module", "parentName": "<global>" |}
34
////declare module "X.Y.Z" {
45
////}
56
////
6-
////{| "itemName": "'X2.Y2.Z2'", "kind": "module" |}
7+
////{| "itemName": "'X2.Y2.Z2'", "kind": "module", "parentName": "<global>" |}
78
////declare module 'X2.Y2.Z2' {
89
////}
910
////
10-
////{| "itemName": "A.B.C", "kind": "module" |}
11+
////{| "itemName": "A.B.C", "kind": "module", "parentName": "<global>" |}
1112
////module A.B.C {
1213
//// {| "itemName": "x", "kind": "var", "parentName": "A.B.C" |}
1314
//// export var x;
1415
////}
1516
////
16-
////{| "itemName": "A.B", "kind": "module" |}
17+
////{| "itemName": "A.B", "kind": "module", "parentName": "<global>" |}
1718
////module A.B {
1819
//// {| "itemName": "y", "kind": "var", "parentName": "A.B" |}
1920
//// export var y;
2021
////}
2122
////
22-
////{| "itemName": "A", "kind": "module" |}
23+
////{| "itemName": "A", "kind": "module", "parentName": "<global>" |}
2324
////module A {
2425
//// {| "itemName": "z", "kind": "var", "parentName": "A" |}
2526
//// export var z;
2627
////}
2728
////
28-
////{| "itemName": "A", "kind": "module" |}
29+
////{| "itemName": "A", "kind": "module", "parentName": "<global>" |}
2930
////module A {
30-
//// {| "itemName": "B", "kind": "module", "parentName": "" |}
31+
//// {| "itemName": "B", "kind": "module", "parentName": "A" |}
3132
//// module B {
32-
//// {| "itemName": "C", "kind": "module", "parentName": "" |}
33+
//// {| "itemName": "C", "kind": "module", "parentName": "B" |}
3334
//// module C {
3435
//// {| "itemName": "x", "kind": "var", "parentName": "C" |}
3536
//// declare var x;
@@ -45,4 +46,4 @@ test.markers().forEach((marker) => {
4546
/// We have 8 module keywords, and 4 var keywords.
4647
/// The declarations of A.B.C.x do not get merged, so the 4 vars are independent.
4748
/// The two 'A' modules, however, do get merged, so in reality we have 7 modules.
48-
verify.navigationBarCount(11);
49+
verify.navigationBarCount(19);

‎tests/cases/fourslash/navigationBarItemsMultilineStringIdentifiers.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

2-
////{| "itemName": "\"Multiline\\r\\nMadness\"", "kind": "module" |}
2+
////{| "itemName": "\"Multiline\\r\\nMadness\"", "kind": "module", "parentName": "<global>" |}
33
////declare module "Multiline\r\nMadness" {
44
////}
55
////
6-
////{| "itemName": "\"Multiline\\\nMadness\"", "kind": "module" |}
6+
////{| "itemName": "\"Multiline\\\nMadness\"", "kind": "module", "parentName": "<global>" |}
77
////declare module "Multiline\
88
////Madness" {
99
////}
10-
////{| "itemName": "\"MultilineMadness\"", "kind": "module" |}
10+
////{| "itemName": "\"MultilineMadness\"", "kind": "module", "parentName": "<global>" |}
1111
////declare module "MultilineMadness" {}
1212
////
1313
////{| "itemName": "Foo", "kind": "interface" |}
@@ -38,4 +38,4 @@ test.markers().forEach((marker) => {
3838
verify.navigationBarContains(marker.data.itemName, marker.data.kind, marker.fileName, marker.data.parentName);
3939
});
4040

41-
verify.navigationBarCount(9); // interface w/ 2 properties, class w/ 2 properties, 3 modules
41+
verify.navigationBarCount(13);

‎tests/cases/fourslash/server/navbar01.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
////}
1111
////
1212
/////// Module
13-
////{| "itemName": "Shapes", "kind": "module", "parentName": "" |}module Shapes {
13+
////{| "itemName": "Shapes", "kind": "module", "parentName": "<global>" |}module Shapes {
1414
////
1515
//// // Class
1616
//// {| "itemName": "Point", "kind": "class", "parentName": "" |}export class Point implements IPoint {
@@ -49,4 +49,4 @@ test.markers().forEach((marker) => {
4949
}
5050
});
5151

52-
verify.navigationBarCount(24);
52+
verify.navigationBarCount(25);

0 commit comments

Comments
 (0)