maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Report error if --allowJs option is used along with --declaration

Browse source
This commit is contained in:
Sheetal Nandi 2015-10-30 11:50:07 -07:00
parent 94a647b72b
commit daba901619
37 changed files with 214 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/compiler/program.ts
View file

@ -1252,6 +1252,9 @@ namespace ts {
programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "declaration"));
}
}
else if (options.allowJs && options.declaration) {
programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "allowJs", "declaration"));
}
if (options.emitDecoratorMetadata &&
!options.experimentalDecorators) {

2
tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt
View file

@ -1,6 +1,8 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
tests/cases/compiler/a.ts(1,10): error TS2393: Duplicate function implementation.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== tests/cases/compiler/b.js (0 errors) ====
function foo() {
return 10;

2
tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt
View file

@ -1,6 +1,8 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
tests/cases/compiler/a.ts(1,10): error TS2393: Duplicate function implementation.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== tests/cases/compiler/a.ts (1 errors) ====
function foo() {
~~~

9
tests/baselines/reference/jsFileCompilationDuplicateVariable.errors.txt Normal file
View file

@ -0,0 +1,9 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== tests/cases/compiler/a.ts (0 errors) ====
var x = 10;
==== tests/cases/compiler/b.js (0 errors) ====
var x = "hello"; // No error is recorded here and declaration file will show this as number

8
tests/baselines/reference/jsFileCompilationDuplicateVariable.symbols
View file

@ -1,8 +0,0 @@
=== tests/cases/compiler/a.ts ===
var x = 10;
>x : Symbol(x, Decl(a.ts, 0, 3), Decl(b.js, 0, 3))
=== tests/cases/compiler/b.js ===
var x = "hello"; // No error is recorded here and declaration file will show this as number
>x : Symbol(x, Decl(a.ts, 0, 3), Decl(b.js, 0, 3))

10
tests/baselines/reference/jsFileCompilationDuplicateVariable.types
View file

@ -1,10 +0,0 @@
=== tests/cases/compiler/a.ts ===
var x = 10;
>x : number
>10 : number
=== tests/cases/compiler/b.js ===
var x = "hello"; // No error is recorded here and declaration file will show this as number
>x : number
>"hello" : string

2
tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt
View file

@ -1,6 +1,8 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
tests/cases/compiler/a.ts(1,5): error TS2403: Subsequent variable declarations must have the same type. Variable 'x' must be of type 'string', but here has type 'number'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== tests/cases/compiler/b.js (0 errors) ====
var x = "hello";

12
tests/baselines/reference/jsFileCompilationEmitDeclarations.errors.txt Normal file
View file

@ -0,0 +1,12 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== tests/cases/compiler/a.ts (0 errors) ====
class c {
}
==== tests/cases/compiler/b.js (0 errors) ====
function foo() {
}

10
tests/baselines/reference/jsFileCompilationEmitDeclarations.symbols
View file

@ -1,10 +0,0 @@
=== tests/cases/compiler/a.ts ===
class c {
>c : Symbol(c, Decl(a.ts, 0, 0))
}
=== tests/cases/compiler/b.js ===
function foo() {
>foo : Symbol(foo, Decl(b.js, 0, 0))
}

10
tests/baselines/reference/jsFileCompilationEmitDeclarations.types
View file

@ -1,10 +0,0 @@
=== tests/cases/compiler/a.ts ===
class c {
>c : c
}
=== tests/cases/compiler/b.js ===
function foo() {
>foo : () => void
}

16
tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.errors.txt Normal file
View file

@ -0,0 +1,16 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== tests/cases/compiler/a.ts (0 errors) ====
class c {
}
==== tests/cases/compiler/b.js (0 errors) ====
/// <reference path="c.js"/>
function foo() {
}
==== tests/cases/compiler/c.js (0 errors) ====
function bar() {
}

15
tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.symbols
View file

@ -1,15 +0,0 @@
=== tests/cases/compiler/a.ts ===
class c {
>c : Symbol(c, Decl(a.ts, 0, 0))
}
=== tests/cases/compiler/b.js ===
/// <reference path="c.js"/>
function foo() {
>foo : Symbol(foo, Decl(b.js, 0, 0))
}
=== tests/cases/compiler/c.js ===
function bar() {
>bar : Symbol(bar, Decl(c.js, 0, 0))
}

15
tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.types
View file

@ -1,15 +0,0 @@
=== tests/cases/compiler/a.ts ===
class c {
>c : c
}
=== tests/cases/compiler/b.js ===
/// <reference path="c.js"/>
function foo() {
>foo : () => void
}
=== tests/cases/compiler/c.js ===
function bar() {
>bar : () => void
}

2
tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt
View file

@ -1,6 +1,8 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
error TS5055: Cannot write file 'tests/cases/compiler/c.js' which is one of the input files.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' which is one of the input files.
==== tests/cases/compiler/a.ts (0 errors) ====
class c {

17
tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt Normal file
View file

@ -0,0 +1,17 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== tests/cases/compiler/a.ts (0 errors) ====
class c {
}
==== tests/cases/compiler/b.ts (0 errors) ====
/// <reference path="c.js"/>
// error on above reference when emitting declarations
function foo() {
}
==== tests/cases/compiler/c.js (0 errors) ====
function bar() {
}

16
tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.symbols
View file

@ -1,16 +0,0 @@
=== tests/cases/compiler/a.ts ===
class c {
>c : Symbol(c, Decl(a.ts, 0, 0))
}
=== tests/cases/compiler/b.ts ===
/// <reference path="c.js"/>
// error on above reference when emitting declarations
function foo() {
>foo : Symbol(foo, Decl(b.ts, 0, 0))
}
=== tests/cases/compiler/c.js ===
function bar() {
>bar : Symbol(bar, Decl(c.js, 0, 0))
}

16
tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.types
View file

@ -1,16 +0,0 @@
=== tests/cases/compiler/a.ts ===
class c {
>c : c
}
=== tests/cases/compiler/b.ts ===
/// <reference path="c.js"/>
// error on above reference when emitting declarations
function foo() {
>foo : () => void
}
=== tests/cases/compiler/c.js ===
function bar() {
>bar : () => void
}

17
tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.errors.txt Normal file
View file

@ -0,0 +1,17 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== tests/cases/compiler/a.ts (0 errors) ====
class c {
}
==== tests/cases/compiler/b.ts (0 errors) ====
/// <reference path="c.js"/>
// b.d.ts should have c.js as the reference path since we dont emit declarations for js files
function foo() {
}
==== tests/cases/compiler/c.js (0 errors) ====
function bar() {
}

38
tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.js Normal file
View file

@ -0,0 +1,38 @@
//// [tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.ts] ////
//// [a.ts]
class c {
}
//// [b.ts]
/// <reference path="c.js"/>
// b.d.ts should have c.js as the reference path since we dont emit declarations for js files
function foo() {
}
//// [c.js]
function bar() {
}
//// [a.js]
var c = (function () {
function c() {
}
return c;
})();
//// [c.js]
function bar() {
}
//// [b.js]
/// <reference path="c.js"/>
// b.d.ts should have c.js as the reference path since we dont emit declarations for js files
function foo() {
}
//// [a.d.ts]
declare class c {
}
//// [b.d.ts]
/// <reference path="c.js" />
declare function foo(): void;

16
tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.symbols
View file

@ -1,16 +0,0 @@
=== tests/cases/compiler/a.ts ===
class c {
>c : Symbol(c, Decl(a.ts, 0, 0))
}
=== tests/cases/compiler/b.ts ===
/// <reference path="c.js"/>
// b.d.ts should have c.js as the reference path since we dont emit declarations for js files
function foo() {
>foo : Symbol(foo, Decl(b.ts, 0, 0))
}
=== tests/cases/compiler/c.js ===
function bar() {
>bar : Symbol(bar, Decl(c.js, 0, 0))
}

16
tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.types
View file

@ -1,16 +0,0 @@
=== tests/cases/compiler/a.ts ===
class c {
>c : c
}
=== tests/cases/compiler/b.ts ===
/// <reference path="c.js"/>
// b.d.ts should have c.js as the reference path since we dont emit declarations for js files
function foo() {
>foo : () => void
}
=== tests/cases/compiler/c.js ===
function bar() {
>bar : () => void
}

12
tests/baselines/reference/jsFileCompilationLetDeclarationOrder.errors.txt Normal file
View file

@ -0,0 +1,12 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== tests/cases/compiler/b.js (0 errors) ====
let a = 10;
b = 30;
==== tests/cases/compiler/a.ts (0 errors) ====
let b = 30;
a = 10;

14
tests/baselines/reference/jsFileCompilationLetDeclarationOrder.symbols
View file

@ -1,14 +0,0 @@
=== tests/cases/compiler/b.js ===
let a = 10;
>a : Symbol(a, Decl(b.js, 0, 3))
b = 30;
>b : Symbol(b, Decl(a.ts, 0, 3))
=== tests/cases/compiler/a.ts ===
let b = 30;
>b : Symbol(b, Decl(a.ts, 0, 3))
a = 10;
>a : Symbol(a, Decl(b.js, 0, 3))

20
tests/baselines/reference/jsFileCompilationLetDeclarationOrder.types
View file

@ -1,20 +0,0 @@
=== tests/cases/compiler/b.js ===
let a = 10;
>a : number
>10 : number
b = 30;
>b = 30 : number
>b : number
>30 : number
=== tests/cases/compiler/a.ts ===
let b = 30;
>b : number
>30 : number
a = 10;
>a = 10 : number
>a : number
>10 : number

2
tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt
View file

@ -1,6 +1,8 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
tests/cases/compiler/a.ts(2,1): error TS2448: Block-scoped variable 'a' used before its declaration.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== tests/cases/compiler/a.ts (1 errors) ====
let b = 30;
a = 10;

8
tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt Normal file
View file

@ -0,0 +1,8 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== DifferentNamesNotSpecifiedWithAllowJs/a.ts (0 errors) ====
var test = 10;
==== DifferentNamesNotSpecifiedWithAllowJs/b.js (0 errors) ====
var test2 = 10; // Should get compiled

8
tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt Normal file
View file

@ -0,0 +1,8 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== DifferentNamesNotSpecifiedWithAllowJs/a.ts (0 errors) ====
var test = 10;
==== DifferentNamesNotSpecifiedWithAllowJs/b.js (0 errors) ====
var test2 = 10; // Should get compiled

8
tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt Normal file
View file

@ -0,0 +1,8 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== DifferentNamesSpecifiedWithAllowJs/a.ts (0 errors) ====
var test = 10;
==== DifferentNamesSpecifiedWithAllowJs/b.js (0 errors) ====
var test2 = 10; // Should get compiled

8
tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt Normal file
View file

@ -0,0 +1,8 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== DifferentNamesSpecifiedWithAllowJs/a.ts (0 errors) ====
var test = 10;
==== DifferentNamesSpecifiedWithAllowJs/b.js (0 errors) ====
var test2 = 10; // Should get compiled

6
tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt Normal file
View file

@ -0,0 +1,6 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== SameNameDTsSpecifiedWithAllowJs/a.d.ts (0 errors) ====
declare var test: number;

6
tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/node/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt Normal file
View file

@ -0,0 +1,6 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== SameNameDTsSpecifiedWithAllowJs/a.d.ts (0 errors) ====
declare var test: number;

6
tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt Normal file
View file

@ -0,0 +1,6 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== SameNameDTsNotSpecifiedWithAllowJs/a.d.ts (0 errors) ====
declare var a: number;

6
tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt Normal file
View file

@ -0,0 +1,6 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== SameNameDTsNotSpecifiedWithAllowJs/a.d.ts (0 errors) ====
declare var a: number;

6
tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt Normal file
View file

@ -0,0 +1,6 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== SameNameFilesNotSpecifiedWithAllowJs/a.ts (0 errors) ====
var test = 10;

6
tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt Normal file
View file

@ -0,0 +1,6 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== SameNameFilesNotSpecifiedWithAllowJs/a.ts (0 errors) ====
var test = 10;

6
tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt Normal file
View file

@ -0,0 +1,6 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== SameNameTsSpecifiedWithAllowJs/a.ts (0 errors) ====
var test = 10;

6
tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt Normal file
View file

@ -0,0 +1,6 @@
error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
!!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
==== SameNameTsSpecifiedWithAllowJs/a.ts (0 errors) ====
var test = 10;