Cherry-pick PR #47395 into release-4.5 (#47421)

Component commits:
f230a5af47 Add failing test.

3ba84692c6 Guard against undefined module bodies in navbar/navtree.

Co-authored-by: Daniel Rosenwasser <drosen@microsoft.com>
This commit is contained in:
TypeScript Bot
2022-01-13 12:16:36 -08:00
committed by GitHub
co-authored by Daniel Rosenwasser
parent 0854a93040
commit 14016a7851
2 changed files with 28 additions and 1 deletions
+4 -1
View File
@@ -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. */
@@ -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
}
]);