stash

Author: Kingwl

src/compiler/binder.ts

@@ -410,13 +410,22 @@ namespace ts {
                             }
                         }
 
-                        forEach(symbol.declarations, declaration => {
-                            file.bindDiagnostics.push(createDiagnosticForNode(getNameOfDeclaration(declaration) || declaration, message, getDisplayName(declaration)));
-                        });
                         const declarationName = getNameOfDeclaration(node) || node;
-                        const diag = createDiagnosticForNode(declarationName, message, getDisplayName(node))
+                        const relatedInformation: DiagnosticRelatedInformation[] = [];
+                        forEach(symbol.declarations, (declaration, index) => {
+                            const decl = getNameOfDeclaration(declaration) || declaration;
+                            const diag = createDiagnosticForNode(decl, message, getDisplayName(declaration));
+                            file.bindDiagnostics.push(
+                                multipleDefaultExports ? addRelatedInfo(diag, createDiagnosticForNode(declarationName, index === 0 ? Diagnostics.Another_export_default_is_here : Diagnostics.and_here)) : diag
+                            );
+                            if (multipleDefaultExports) {
+                                relatedInformation.push(createDiagnosticForNode(decl, Diagnostics.The_first_export_default_is_here));
+                            }
+                        });
+                        
+                        const diag = createDiagnosticForNode(declarationName, message, getDisplayName(node));
                         file.bindDiagnostics.push(
-                            multipleDefaultExports ? addRelatedInfo(diag, createDiagnosticForNode(declarationName, Diagnostics.This_export_conflicts_with_the_first)) : diag
+                            multipleDefaultExports ? addRelatedInfo(diag, ...relatedInformation) : diag
                         );
 
                         symbol = createSymbol(SymbolFlags.None, name);

src/compiler/diagnosticMessages.json

@@ -2409,10 +2409,14 @@
         "category": "Error",
         "code": 2729
     },
-    "This export conflicts with the first.": {
+    "The first export default is here.": {
         "category": "Error",
         "code": 2730
     },
+    "Another export default is here.": {
+        "category": "Error",
+        "code": 2731
+    },
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",

tests/baselines/reference/multipleDefaultExports01.errors.txt

@@ -1,27 +1,32 @@
 tests/cases/conformance/es6/modules/m1.ts(1,22): error TS2528: A module cannot have multiple default exports.
 tests/cases/conformance/es6/modules/m1.ts(5,25): error TS2528: A module cannot have multiple default exports.
+tests/cases/conformance/es6/modules/m1.ts(5,25): error TS2528: A module cannot have multiple default exports.
 tests/cases/conformance/es6/modules/m1.ts(10,16): error TS2528: A module cannot have multiple default exports.
 
 
-==== tests/cases/conformance/es6/modules/m1.ts (3 errors) ====
+==== tests/cases/conformance/es6/modules/m1.ts (4 errors) ====
     export default class foo {
                          ~~~
 !!! error TS2528: A module cannot have multiple default exports.
-!!! related TS2730 tests/cases/conformance/es6/modules/m1.ts:1:22: This export conflicts with the first.
+!!! related TS2730 tests/cases/conformance/es6/modules/m1.ts:5:25: The first export default is here.
 
     }
 
     export default function bar() {
                             ~~~
 !!! error TS2528: A module cannot have multiple default exports.
+!!! related TS2731 tests/cases/conformance/es6/modules/m1.ts:1:22: Another export default is here.
+                            ~~~
+!!! error TS2528: A module cannot have multiple default exports.
+!!! related TS2731 tests/cases/conformance/es6/modules/m1.ts:10:16: Another export default is here.
 
     }
 
     var x = 10;
     export default x;
                    ~
 !!! error TS2528: A module cannot have multiple default exports.
-!!! related TS2730 tests/cases/conformance/es6/modules/m1.ts:10:16: This export conflicts with the first.
+!!! related TS2730 tests/cases/conformance/es6/modules/m1.ts:5:25: The first export default is here.
 
 ==== tests/cases/conformance/es6/modules/m2.ts (0 errors) ====
     import Entity from "./m1"

tests/baselines/reference/multipleDefaultExports03.errors.txt

@@ -6,10 +6,11 @@ tests/cases/conformance/es6/modules/multipleDefaultExports03.ts(4,22): error TS2
     export default class C {
                          ~
 !!! error TS2528: A module cannot have multiple default exports.
+!!! related TS2731 tests/cases/conformance/es6/modules/multipleDefaultExports03.ts:4:22: Another export default is here.
     }
 
     export default class C {
                          ~
 !!! error TS2528: A module cannot have multiple default exports.
-!!! related TS2730 tests/cases/conformance/es6/modules/multipleDefaultExports03.ts:4:22: This export conflicts with the first.
+!!! related TS2730 tests/cases/conformance/es6/modules/multipleDefaultExports03.ts:1:22: The first export default is here.
     }