microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-23 18:48:40 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix(42259): omit merging modules with different names

Browse Source
This commit is contained in:
Oleksandr T
2021-01-14 15:27:28 +02:00
parent 8ddea6b7a6
commit 8eaf58fd13
3 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/navigationBar.ts
View File

@@ -605,7 +605,8 @@ namespace ts.NavigationBar {
case SyntaxKind.SetAccessor:
return hasSyntacticModifier(a, ModifierFlags.Static) === hasSyntacticModifier(b, ModifierFlags.Static);
case SyntaxKind.ModuleDeclaration:
return areSameModule(<ModuleDeclaration>a, <ModuleDeclaration>b);
return areSameModule(<ModuleDeclaration>a, <ModuleDeclaration>b)
&& getFullyQualifiedModuleName(<ModuleDeclaration>a) === getFullyQualifiedModuleName(<ModuleDeclaration>b);
default:
return true;
}
@@ -625,7 +626,6 @@ 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 {
// TODO: GH#18217
return a.body!.kind === b.body!.kind && (a.body!.kind !== SyntaxKind.ModuleDeclaration || areSameModule(<ModuleDeclaration>a.body, <ModuleDeclaration>b.body));
}
@@ -845,6 +845,10 @@ namespace ts.NavigationBar {
return getTextOfNode(moduleDeclaration.name);
}
return getFullyQualifiedModuleName(moduleDeclaration);
}
function getFullyQualifiedModuleName(moduleDeclaration: ModuleDeclaration): string {
// Otherwise, we need to aggregate each identifier to build up the qualified name.
const result = [getTextOfIdentifierOrLiteral(moduleDeclaration.name)];
while (moduleDeclaration.body && moduleDeclaration.body.kind === SyntaxKind.ModuleDeclaration) {