microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 12:51:30 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

augment check for colliding declaration spaces

Browse Source
This commit is contained in:
Vladimir Matveev
2014-07-24 16:44:52 -07:00
parent d7f67083b2
commit bb193fedb9
8 changed files with 89 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/baselines/reference/anonymousModules.errors.txt
View File

@@ -1,4 +1,4 @@
==== tests/cases/compiler/anonymousModules.ts (12 errors) ====
==== tests/cases/compiler/anonymousModules.ts (13 errors) ====
module {
~
!!! ';' expected.
@@ -18,13 +18,15 @@
export var bar = 1;
~~~~~~
!!! Statement expected.
~~~
!!! Individual declarations in a merged declaration bar must be all exported or all local.
}
~
!!! Declaration or statement expected.
var bar = 2;
~~~
!!! All declarations of merged declaration 'bar' must be exported or not exported.
!!! Individual declarations in a merged declaration bar must be all exported or all local.
module {
~

36
tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt
View File

@@ -1,4 +1,4 @@
==== tests/cases/compiler/duplicateSymbolsExportMatching.ts (9 errors) ====
==== tests/cases/compiler/duplicateSymbolsExportMatching.ts (18 errors) ====
module M {
export interface E { }
interface I { }
@@ -23,23 +23,29 @@
module N2 {
interface I { }
~
!!! Individual declarations in a merged declaration I must be all exported or all local.
export interface I { } // error
~
!!! All declarations of merged declaration 'I' must be exported or not exported.
!!! Individual declarations in a merged declaration I must be all exported or all local.
export interface E { }
~
!!! Individual declarations in a merged declaration E must be all exported or all local.
interface E { } // error
~
!!! All declarations of merged declaration 'E' must be exported or not exported.
!!! Individual declarations in a merged declaration E must be all exported or all local.
}
// Should report error only once for instantiated module
module M {
module inst {
~~~~
!!! Individual declarations in a merged declaration inst must be all exported or all local.
var t;
}
export module inst { // one error
~~~~
!!! All declarations of merged declaration 'inst' must be exported or not exported.
!!! Individual declarations in a merged declaration inst must be all exported or all local.
var t;
}
}
@@ -47,38 +53,50 @@
// Variables of the same / different type
module M2 {
var v: string;
~
!!! Individual declarations in a merged declaration v must be all exported or all local.
export var v: string; // one error (visibility)
~
!!! All declarations of merged declaration 'v' must be exported or not exported.
!!! Individual declarations in a merged declaration v must be all exported or all local.
var w: number;
~
!!! Individual declarations in a merged declaration w must be all exported or all local.
export var w: string; // two errors (visibility and type mismatch)
~
!!! All declarations of merged declaration 'w' must be exported or not exported.
!!! Individual declarations in a merged declaration w must be all exported or all local.
}
module M {
module F {
~
!!! A module declaration cannot be located prior to a class or function with which it is merged
~
!!! Individual declarations in a merged declaration F must be all exported or all local.
var t;
}
export function F() { } // Only one error for duplicate identifier (don't consider visibility)
~
!!! All declarations of merged declaration 'F' must be exported or not exported.
!!! Individual declarations in a merged declaration F must be all exported or all local.
}
module M {
class C { }
~
!!! Individual declarations in a merged declaration C must be all exported or all local.
module C { }
~
!!! Individual declarations in a merged declaration C must be all exported or all local.
export module C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol)
~
!!! All declarations of merged declaration 'C' must be exported or not exported.
!!! Individual declarations in a merged declaration C must be all exported or all local.
var t;
}
}
// Top level
interface D { }
~
!!! Individual declarations in a merged declaration D must be all exported or all local.
export interface D { }
~
!!! All declarations of merged declaration 'D' must be exported or not exported.
!!! Individual declarations in a merged declaration D must be all exported or all local.

14
tests/baselines/reference/mixedExports.js Normal file
View File

@@ -0,0 +1,14 @@
//// [mixedExports.ts]
declare module M {
function foo();
export function foo();
function foo();
}
module A {
interface X {x}
export module X {}
interface X {y}
}
//// [mixedExports.js]

6
tests/baselines/reference/multivar.errors.txt
View File

@@ -1,10 +1,12 @@
==== tests/cases/compiler/multivar.ts (1 errors) ====
==== tests/cases/compiler/multivar.ts (2 errors) ====
var a,b,c;
var x=1,y=2,z=3;
module m2 {
export var a, b2: number = 10, b;
~~
!!! Individual declarations in a merged declaration b2 must be all exported or all local.
var m1;
var a2, b22: number = 10, b222;
var m3;
@@ -22,7 +24,7 @@
declare var d1, d2;
var b2;
~~
!!! All declarations of merged declaration 'b2' must be exported or not exported.
!!! Individual declarations in a merged declaration b2 must be all exported or all local.
declare var v1;
}

11
tests/cases/compiler/mixedExports.ts Normal file
View File

@@ -0,0 +1,11 @@
declare module M {
function foo();
export function foo();
function foo();
}
module A {
interface X {x}
export module X {}
interface X {y}
}