Skip to content

Disallow merging for default export declarations #3973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jul 27, 2015
Merged

Disallow merging for default export declarations #3973

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e2c1696
Added tests.
DanielRosenwasser Jul 16, 2015
17593bf
Accepted baselines.
DanielRosenwasser Jul 16, 2015
b403da3
Removed baselines Ryan forgot to remove.
DanielRosenwasser Jul 16, 2015
3e29289
Minor cleanup.
DanielRosenwasser Jul 16, 2015
89398e6
Added single quotes around the declaration name in an error.
DanielRosenwasser Jul 16, 2015
d0fb339
Accepted baselines.
DanielRosenwasser Jul 16, 2015
90f3153
Renamed tests.
DanielRosenwasser Jul 17, 2015
a38dec0
Renamed/accepted baselines.
DanielRosenwasser Jul 17, 2015
f631a20
Added another test.
DanielRosenwasser Jul 22, 2015
7e46445
Accepted baselines.
DanielRosenwasser Jul 22, 2015
8d5d73e
Take default export spaces into account when checking merged declarat…
DanielRosenwasser Jul 22, 2015
be44bc6
Accepted baselines.
DanielRosenwasser Jul 22, 2015
18e36b8
Add suggestion to error message.
DanielRosenwasser Jul 22, 2015
beff651
Accepted baselines.
DanielRosenwasser Jul 22, 2015
ae68352
Merge remote-tracking branch 'origin/master' into disallowDefaultExpo…
DanielRosenwasser Jul 22, 2015
0f828ca
Accepted baselines.
DanielRosenwasser Jul 22, 2015
cf801ef
Added test.
DanielRosenwasser Jul 27, 2015
b84e407
Accepted baselines.
DanielRosenwasser Jul 27, 2015
bad5919
Addressed CR feedback.
DanielRosenwasser Jul 27, 2015
a8f0491
space -> spaces
DanielRosenwasser Jul 27, 2015
9290201
Added a test.
DanielRosenwasser Jul 27, 2015
157235f
Fixed test message.
DanielRosenwasser Jul 27, 2015
28ce0a1
Accepted baselines.
DanielRosenwasser Jul 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Accepted baselines.
  • Loading branch information
@DanielRosenwasser
DanielRosenwasser committed Jul 22, 2015
commit be44bc651c45d31c080323b14b5f3ed77118b1b1
8 changes: 7 additions & 1 deletion tests/baselines/reference/defaultExportsCannotMerge01.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
tests/cases/conformance/es6/modules/m1.ts(2,25): error TS2651: Merged declaration 'Decl' cannot include a default export declaration.
tests/cases/conformance/es6/modules/m1.ts(11,18): error TS2651: Merged declaration 'Decl' cannot include a default export declaration.
tests/cases/conformance/es6/modules/m2.ts(5,8): error TS2304: Cannot find name 'Entity'.
tests/cases/conformance/es6/modules/m2.ts(6,8): error TS2503: Cannot find namespace 'Entity'.
tests/cases/conformance/es6/modules/m2.ts(8,8): error TS2339: Property 'x' does not exist on type '() => number'.
tests/cases/conformance/es6/modules/m2.ts(9,8): error TS2339: Property 'y' does not exist on type '() => number'.


==== tests/cases/conformance/es6/modules/m1.ts (0 errors) ====
==== tests/cases/conformance/es6/modules/m1.ts (2 errors) ====

export default function Decl() {
~~~~
!!! error TS2651: Merged declaration 'Decl' cannot include a default export declaration.
return 0;
}

Expand All @@ -16,6 +20,8 @@ tests/cases/conformance/es6/modules/m2.ts(9,8): error TS2339: Property 'y' does
}

export namespace Decl {
~~~~
!!! error TS2651: Merged declaration 'Decl' cannot include a default export declaration.
export var x = 10;
export var y = 20;

Expand Down
8 changes: 7 additions & 1 deletion tests/baselines/reference/defaultExportsCannotMerge02.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
tests/cases/conformance/es6/modules/m1.ts(2,22): error TS2651: Merged declaration 'Decl' cannot include a default export declaration.
tests/cases/conformance/es6/modules/m1.ts(5,18): error TS2651: Merged declaration 'Decl' cannot include a default export declaration.
tests/cases/conformance/es6/modules/m2.ts(3,1): error TS2348: Value of type 'typeof Decl' is not callable. Did you mean to include 'new'?
tests/cases/conformance/es6/modules/m2.ts(6,8): error TS2503: Cannot find namespace 'Entity'.
tests/cases/conformance/es6/modules/m2.ts(8,13): error TS2339: Property 'p1' does not exist on type 'Decl'.
tests/cases/conformance/es6/modules/m2.ts(8,20): error TS2339: Property 'p2' does not exist on type 'Decl'.


==== tests/cases/conformance/es6/modules/m1.ts (0 errors) ====
==== tests/cases/conformance/es6/modules/m1.ts (2 errors) ====

export default class Decl {
~~~~
!!! error TS2651: Merged declaration 'Decl' cannot include a default export declaration.
}

export interface Decl {
~~~~
!!! error TS2651: Merged declaration 'Decl' cannot include a default export declaration.
p1: number;
p2: number;
}
Expand Down