diff --git a/lib/tsc.js b/lib/tsc.js
index 7e1d1c6935a..03277b2193b 100644
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -29669,7 +29669,9 @@ var ts;
                 var diagnostic = exportedSymbol
                     ? error(name, ts.Diagnostics.Module_0_declares_1_locally_but_it_is_exported_as_2, moduleName, declarationName, symbolToString(exportedSymbol))
                     : error(name, ts.Diagnostics.Module_0_declares_1_locally_but_it_is_not_exported, moduleName, declarationName);
-                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(localSymbol.valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                ts.addRelatedInfo.apply(void 0, __spreadArrays([diagnostic], ts.map(localSymbol.declarations, function (decl, index) {
+                    return ts.createDiagnosticForNode(decl, index === 0 ? ts.Diagnostics._0_is_declared_here : ts.Diagnostics.and_here, declarationName);
+                })));
             }
             else {
                 error(name, ts.Diagnostics.Module_0_has_no_exported_member_1, moduleName, declarationName);
diff --git a/lib/tsserver.js b/lib/tsserver.js
index f92ada0dd1b..1aca4c95e87 100644
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -36212,7 +36212,9 @@ var ts;
                 var diagnostic = exportedSymbol
                     ? error(name, ts.Diagnostics.Module_0_declares_1_locally_but_it_is_exported_as_2, moduleName, declarationName, symbolToString(exportedSymbol))
                     : error(name, ts.Diagnostics.Module_0_declares_1_locally_but_it_is_not_exported, moduleName, declarationName);
-                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(localSymbol.valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                ts.addRelatedInfo.apply(void 0, __spreadArrays([diagnostic], ts.map(localSymbol.declarations, function (decl, index) {
+                    return ts.createDiagnosticForNode(decl, index === 0 ? ts.Diagnostics._0_is_declared_here : ts.Diagnostics.and_here, declarationName);
+                })));
             }
             else {
                 error(name, ts.Diagnostics.Module_0_has_no_exported_member_1, moduleName, declarationName);
diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
index 5c3f038fafe..712a7209945 100644
--- a/lib/tsserverlibrary.js
+++ b/lib/tsserverlibrary.js
@@ -36362,7 +36362,9 @@ var ts;
                 var diagnostic = exportedSymbol
                     ? error(name, ts.Diagnostics.Module_0_declares_1_locally_but_it_is_exported_as_2, moduleName, declarationName, symbolToString(exportedSymbol))
                     : error(name, ts.Diagnostics.Module_0_declares_1_locally_but_it_is_not_exported, moduleName, declarationName);
-                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(localSymbol.valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                ts.addRelatedInfo.apply(void 0, __spreadArrays([diagnostic], ts.map(localSymbol.declarations, function (decl, index) {
+                    return ts.createDiagnosticForNode(decl, index === 0 ? ts.Diagnostics._0_is_declared_here : ts.Diagnostics.and_here, declarationName);
+                })));
             }
             else {
                 error(name, ts.Diagnostics.Module_0_has_no_exported_member_1, moduleName, declarationName);
diff --git a/lib/typescript.js b/lib/typescript.js
index 8a30cba8001..28cac7dff93 100644
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -36362,7 +36362,9 @@ var ts;
                 var diagnostic = exportedSymbol
                     ? error(name, ts.Diagnostics.Module_0_declares_1_locally_but_it_is_exported_as_2, moduleName, declarationName, symbolToString(exportedSymbol))
                     : error(name, ts.Diagnostics.Module_0_declares_1_locally_but_it_is_not_exported, moduleName, declarationName);
-                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(localSymbol.valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                ts.addRelatedInfo.apply(void 0, __spreadArrays([diagnostic], ts.map(localSymbol.declarations, function (decl, index) {
+                    return ts.createDiagnosticForNode(decl, index === 0 ? ts.Diagnostics._0_is_declared_here : ts.Diagnostics.and_here, declarationName);
+                })));
             }
             else {
                 error(name, ts.Diagnostics.Module_0_has_no_exported_member_1, moduleName, declarationName);
diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
index fbfe23ac8c0..8a51f86cb1d 100644
--- a/lib/typescriptServices.js
+++ b/lib/typescriptServices.js
@@ -36362,7 +36362,9 @@ var ts;
                 var diagnostic = exportedSymbol
                     ? error(name, ts.Diagnostics.Module_0_declares_1_locally_but_it_is_exported_as_2, moduleName, declarationName, symbolToString(exportedSymbol))
                     : error(name, ts.Diagnostics.Module_0_declares_1_locally_but_it_is_not_exported, moduleName, declarationName);
-                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(localSymbol.valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                ts.addRelatedInfo.apply(void 0, __spreadArrays([diagnostic], ts.map(localSymbol.declarations, function (decl, index) {
+                    return ts.createDiagnosticForNode(decl, index === 0 ? ts.Diagnostics._0_is_declared_here : ts.Diagnostics.and_here, declarationName);
+                })));
             }
             else {
                 error(name, ts.Diagnostics.Module_0_has_no_exported_member_1, moduleName, declarationName);
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
index 018ceda12d7..5e7d12f859f 100644
--- a/lib/typingsInstaller.js
+++ b/lib/typingsInstaller.js
@@ -36201,7 +36201,9 @@ var ts;
                 var diagnostic = exportedSymbol
                     ? error(name, ts.Diagnostics.Module_0_declares_1_locally_but_it_is_exported_as_2, moduleName, declarationName, symbolToString(exportedSymbol))
                     : error(name, ts.Diagnostics.Module_0_declares_1_locally_but_it_is_not_exported, moduleName, declarationName);
-                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(localSymbol.valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                ts.addRelatedInfo.apply(void 0, __spreadArrays([diagnostic], ts.map(localSymbol.declarations, function (decl, index) {
+                    return ts.createDiagnosticForNode(decl, index === 0 ? ts.Diagnostics._0_is_declared_here : ts.Diagnostics.and_here, declarationName);
+                })));
             }
             else {
                 error(name, ts.Diagnostics.Module_0_has_no_exported_member_1, moduleName, declarationName);