accept baseline

Kingwl · Kingwl · commit 2ffa94c646d8 · 2018-07-06T17:37:08.000+08:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -388,12 +388,14 @@ namespace ts {
                             message = Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations;
                         }
 
-                        if (symbol.declarations && symbol.declarations.length) {
+                        let multipleDefaultExports = false;
+                        if (length(symbol.declarations)) {
                             // If the current node is a default export of some sort, then check if
                             // there are any other default exports that we need to error on.
                             // We'll know whether we have other default exports depending on if `symbol` already has a declaration list set.
                             if (isDefaultExport) {
                                 message = Diagnostics.A_module_cannot_have_multiple_default_exports;
+                                multipleDefaultExports = true;
                             }
                             else {
                                 // This is to properly report an error in the case "export default { }" is after export default of class declaration or function declaration.
@@ -403,6 +405,7 @@ namespace ts {
                                 if (symbol.declarations && symbol.declarations.length &&
                                     (node.kind === SyntaxKind.ExportAssignment && !(<ExportAssignment>node).isExportEquals)) {
                                     message = Diagnostics.A_module_cannot_have_multiple_default_exports;
+                                    multipleDefaultExports = true;
                                 }
                             }
                         }
@@ -413,7 +416,7 @@ namespace ts {
                         const declarationName = getNameOfDeclaration(node) || node;
                         const diag = createDiagnosticForNode(declarationName, message, getDisplayName(node))
                         file.bindDiagnostics.push(
-                            isDefaultExport ? addRelatedInfo( diag, createDiagnosticForNode(declarationName, Diagnostics.This_export_conflicts_with_the_first)) : diag
+                            multipleDefaultExports ? addRelatedInfo(diag, createDiagnosticForNode(declarationName, Diagnostics.This_export_conflicts_with_the_first)) : diag
                         );
 
                         symbol = createSymbol(SymbolFlags.None, name);
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -5432,6 +5432,7 @@ declare namespace ts {
         Cannot_find_lib_definition_for_0_Did_you_mean_1: DiagnosticMessage;
         _0_was_declared_here: DiagnosticMessage;
         Property_0_is_used_before_its_initialization: DiagnosticMessage;
+        This_export_conflicts_with_the_first: DiagnosticMessage;
         Import_declaration_0_is_using_private_name_1: DiagnosticMessage;
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: DiagnosticMessage;
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: DiagnosticMessage;
@@ -7399,6 +7400,7 @@ declare namespace ts {
     type Mutable<T extends object> = {
         -readonly [K in keyof T]: T[K];
     };
+    function addRelatedInfo<T extends Diagnostic>(diagnostic: T, ...relatedInformation: DiagnosticRelatedInformation[]): T;
 }
 declare namespace ts {
     function createNode(kind: SyntaxKind, pos?: number, end?: number): Node;
diff --git a/tests/baselines/reference/exportDefaultAlias_excludesEverything.errors.txt b/tests/baselines/reference/exportDefaultAlias_excludesEverything.errors.txt
@@ -10,4 +10,5 @@ tests/cases/compiler/exportDefaultAlias_excludesEverything.ts(3,16): error TS252
     export default B;
                    ~
 !!! error TS2528: A module cannot have multiple default exports.
+!!! related TS2730 tests/cases/compiler/exportDefaultAlias_excludesEverything.ts:3:16: This export conflicts with the first.
     
diff --git a/tests/baselines/reference/jsFileCompilationBindMultipleDefaultExports.errors.txt b/tests/baselines/reference/jsFileCompilationBindMultipleDefaultExports.errors.txt
@@ -15,6 +15,7 @@ tests/cases/compiler/a.js(3,20): error TS2652: Merged declaration 'a' cannot inc
     export default var a = 10;
                   
 !!! error TS2528: A module cannot have multiple default exports.
+!!! related TS2730 tests/cases/compiler/a.js:3:15: This export conflicts with the first.
                    ~~~
 !!! error TS1109: Expression expected.
                        ~
diff --git a/tests/baselines/reference/multipleDefaultExports01.errors.txt b/tests/baselines/reference/multipleDefaultExports01.errors.txt
@@ -7,6 +7,7 @@ tests/cases/conformance/es6/modules/m1.ts(10,16): error TS2528: A module cannot
     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.
     
     }
     
@@ -20,6 +21,7 @@ tests/cases/conformance/es6/modules/m1.ts(10,16): error TS2528: A module cannot
     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.
     
 ==== tests/cases/conformance/es6/modules/m2.ts (0 errors) ====
     import Entity from "./m1"
diff --git a/tests/baselines/reference/multipleDefaultExports03.errors.txt b/tests/baselines/reference/multipleDefaultExports03.errors.txt
@@ -11,4 +11,5 @@ 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 TS2730 tests/cases/conformance/es6/modules/multipleDefaultExports03.ts:4:22: This export conflicts with the first.
     }
diff --git a/tests/baselines/reference/multipleExportDefault1.errors.txt b/tests/baselines/reference/multipleExportDefault1.errors.txt
@@ -16,4 +16,5 @@ tests/cases/conformance/externalModules/multipleExportDefault1.ts(5,1): error TS
     };
     ~~
 !!! error TS2528: A module cannot have multiple default exports.
+!!! related TS2730 tests/cases/conformance/externalModules/multipleExportDefault1.ts:5:1: This export conflicts with the first.
     
diff --git a/tests/baselines/reference/multipleExportDefault2.errors.txt b/tests/baselines/reference/multipleExportDefault2.errors.txt
@@ -10,6 +10,7 @@ tests/cases/conformance/externalModules/multipleExportDefault2.ts(5,25): error T
     };
     ~~
 !!! error TS2528: A module cannot have multiple default exports.
+!!! related TS2730 tests/cases/conformance/externalModules/multipleExportDefault2.ts:1:1: This export conflicts with the first.
     
     export default function Foo() { }
                             ~~~
diff --git a/tests/baselines/reference/multipleExportDefault3.errors.txt b/tests/baselines/reference/multipleExportDefault3.errors.txt
@@ -14,5 +14,6 @@ tests/cases/conformance/externalModules/multipleExportDefault3.ts(5,22): error T
     export default class C { }
                          ~
 !!! error TS2528: A module cannot have multiple default exports.
+!!! related TS2730 tests/cases/conformance/externalModules/multipleExportDefault3.ts:5:22: This export conflicts with the first.
     
     
diff --git a/tests/baselines/reference/multipleExportDefault4.errors.txt b/tests/baselines/reference/multipleExportDefault4.errors.txt
@@ -13,4 +13,5 @@ tests/cases/conformance/externalModules/multipleExportDefault4.ts(3,1): error TS
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     };
     ~~
-!!! error TS2528: A module cannot have multiple default exports.
+!!! error TS2528: A module cannot have multiple default exports.
+!!! related TS2730 tests/cases/conformance/externalModules/multipleExportDefault4.ts:3:1: This export conflicts with the first.
diff --git a/tests/baselines/reference/multipleExportDefault5.errors.txt b/tests/baselines/reference/multipleExportDefault5.errors.txt
@@ -8,4 +8,5 @@ tests/cases/conformance/externalModules/multipleExportDefault5.ts(2,22): error T
 !!! error TS2528: A module cannot have multiple default exports.
     export default class C {}
                          ~
-!!! error TS2528: A module cannot have multiple default exports.
+!!! error TS2528: A module cannot have multiple default exports.
+!!! related TS2730 tests/cases/conformance/externalModules/multipleExportDefault5.ts:2:22: This export conflicts with the first.
diff --git a/tests/baselines/reference/multipleExportDefault6.errors.txt b/tests/baselines/reference/multipleExportDefault6.errors.txt
@@ -17,4 +17,5 @@ tests/cases/conformance/externalModules/multipleExportDefault6.ts(5,1): error TS
     ~~~~~~~~~~
     }
     ~
-!!! error TS2528: A module cannot have multiple default exports.
+!!! error TS2528: A module cannot have multiple default exports.
+!!! related TS2730 tests/cases/conformance/externalModules/multipleExportDefault6.ts:5:1: This export conflicts with the first.

Original file line number	Diff line number	Diff line change
`@@ -388,12 +388,14 @@ namespace ts {`
`388`	`388`	`message = Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations;`
`389`	`389`	`}`
`390`	`390`
`391`		`- if (symbol.declarations && symbol.declarations.length) {`
	`391`	`+ let multipleDefaultExports = false;`
	`392`	`+ if (length(symbol.declarations)) {`
`392`	`393`	`// If the current node is a default export of some sort, then check if`
`393`	`394`	`// there are any other default exports that we need to error on.`
`394`	`395`	// We'll know whether we have other default exports depending on if `symbol` already has a declaration list set.
`395`	`396`	`if (isDefaultExport) {`
`396`	`397`	`message = Diagnostics.A_module_cannot_have_multiple_default_exports;`
	`398`	`+ multipleDefaultExports = true;`
`397`	`399`	`}`
`398`	`400`	`else {`
`399`	`401`	`// This is to properly report an error in the case "export default { }" is after export default of class declaration or function declaration.`
`@@ -403,6 +405,7 @@ namespace ts {`
`403`	`405`	`if (symbol.declarations && symbol.declarations.length &&`
`404`	`406`	`(node.kind === SyntaxKind.ExportAssignment && !(<ExportAssignment>node).isExportEquals)) {`
`405`	`407`	`message = Diagnostics.A_module_cannot_have_multiple_default_exports;`
	`408`	`+ multipleDefaultExports = true;`
`406`	`409`	`}`
`407`	`410`	`}`
`408`	`411`	`}`
`@@ -413,7 +416,7 @@ namespace ts {`
`413`	`416`	`const declarationName = getNameOfDeclaration(node) \|\| node;`
`414`	`417`	`const diag = createDiagnosticForNode(declarationName, message, getDisplayName(node))`
`415`	`418`	`file.bindDiagnostics.push(`
`416`		`- isDefaultExport ? addRelatedInfo( diag, createDiagnosticForNode(declarationName, Diagnostics.This_export_conflicts_with_the_first)) : diag`
	`419`	`+ multipleDefaultExports ? addRelatedInfo(diag, createDiagnosticForNode(declarationName, Diagnostics.This_export_conflicts_with_the_first)) : diag`
`417`	`420`	`);`
`418`	`421`
`419`	`422`	`symbol = createSymbol(SymbolFlags.None, name);`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,5 @@ tests/cases/compiler/exportDefaultAlias_excludesEverything.ts(3,16): error TS252`
`10`	`10`	`export default B;`
`11`	`11`	`~`
`12`	`12`	`!!! error TS2528: A module cannot have multiple default exports.`
	`13`	`+!!! related TS2730 tests/cases/compiler/exportDefaultAlias_excludesEverything.ts:3:16: This export conflicts with the first.`
`13`	`14`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ tests/cases/compiler/a.js(3,20): error TS2652: Merged declaration 'a' cannot inc`
`15`	`15`	`export default var a = 10;`
`16`	`16`
`17`	`17`	`!!! error TS2528: A module cannot have multiple default exports.`
	`18`	`+!!! related TS2730 tests/cases/compiler/a.js:3:15: This export conflicts with the first.`
`18`	`19`	`~~~`
`19`	`20`	`!!! error TS1109: Expression expected.`
`20`	`21`	`~`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ tests/cases/conformance/es6/modules/m1.ts(10,16): error TS2528: A module cannot`
`7`	`7`	`export default class foo {`
`8`	`8`	`~~~`
`9`	`9`	`!!! error TS2528: A module cannot have multiple default exports.`
	`10`	`+!!! related TS2730 tests/cases/conformance/es6/modules/m1.ts:1:22: This export conflicts with the first.`
`10`	`11`
`11`	`12`	`}`
`12`	`13`
`@@ -20,6 +21,7 @@ tests/cases/conformance/es6/modules/m1.ts(10,16): error TS2528: A module cannot`
`20`	`21`	`export default x;`
`21`	`22`	`~`
`22`	`23`	`!!! error TS2528: A module cannot have multiple default exports.`
	`24`	`+!!! related TS2730 tests/cases/conformance/es6/modules/m1.ts:10:16: This export conflicts with the first.`
`23`	`25`
`24`	`26`	`==== tests/cases/conformance/es6/modules/m2.ts (0 errors) ====`
`25`	`27`	`import Entity from "./m1"`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,5 @@ tests/cases/conformance/es6/modules/multipleDefaultExports03.ts(4,22): error TS2`
`11`	`11`	`export default class C {`
`12`	`12`	`~`
`13`	`13`	`!!! error TS2528: A module cannot have multiple default exports.`
	`14`	`+!!! related TS2730 tests/cases/conformance/es6/modules/multipleDefaultExports03.ts:4:22: This export conflicts with the first.`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,6 @@ tests/cases/conformance/externalModules/multipleExportDefault3.ts(5,22): error T`
`14`	`14`	`export default class C { }`
`15`	`15`	`~`
`16`	`16`	`!!! error TS2528: A module cannot have multiple default exports.`
	`17`	`+!!! related TS2730 tests/cases/conformance/externalModules/multipleExportDefault3.ts:5:22: This export conflicts with the first.`
`17`	`18`
`18`	`19`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,5 @@ tests/cases/conformance/externalModules/multipleExportDefault5.ts(2,22): error T`
`8`	`8`	`!!! error TS2528: A module cannot have multiple default exports.`
`9`	`9`	`export default class C {}`
`10`	`10`	`~`
`11`		`-!!! error TS2528: A module cannot have multiple default exports.`
	`11`	`+!!! error TS2528: A module cannot have multiple default exports.`
	`12`	`+!!! related TS2730 tests/cases/conformance/externalModules/multipleExportDefault5.ts:2:22: This export conflicts with the first.`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,5 @@ tests/cases/conformance/externalModules/multipleExportDefault6.ts(5,1): error TS`
`17`	`17`	`~~~~~~~~~~`
`18`	`18`	`}`
`19`	`19`	`~`
`20`		`-!!! error TS2528: A module cannot have multiple default exports.`
	`20`	`+!!! error TS2528: A module cannot have multiple default exports.`
	`21`	`+!!! related TS2730 tests/cases/conformance/externalModules/multipleExportDefault6.ts:5:1: This export conflicts with the first.`