Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/services/navigationBar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,10 @@ namespace ts.NavigationBar {
// We use 1 NavNode to represent 'A.B.C', but there are multiple source nodes.
// Only merge module nodes that have the same chain. Don't merge 'A.B.C' with 'A'!
function areSameModule(a: ModuleDeclaration, b: ModuleDeclaration): boolean {
return a.body!.kind === b.body!.kind && (a.body!.kind !== SyntaxKind.ModuleDeclaration || areSameModule(a.body as ModuleDeclaration, b.body as ModuleDeclaration));
if (!a.body || !b.body) {
return a.body === b.body;
}
return a.body.kind === b.body.kind && (a.body.kind !== SyntaxKind.ModuleDeclaration || areSameModule(a.body as ModuleDeclaration, b.body as ModuleDeclaration));
}

/** Merge source into target. Source should be thrown away after this is called. */
Expand Down
24 changes: 24 additions & 0 deletions tests/cases/fourslash/navbarForDoubleAmbientModules01.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/// <reference path="./fourslash.ts" />

//// declare module "foo";
//// declare module "foo";

verify.navigationBar([
{
"text": "<global>",
"kind": "script",
"childItems": [
{
"text": "\"foo\"",
"kind": "module",
"kindModifiers": "declare"
}
]
},
{
"text": "\"foo\"",
"kind": "module",
"kindModifiers": "declare",
"indent": 1
}
]);