microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-10 06:41:59 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #7409 from anilanar/allowOutWithNoEmit

Browse Source 
Fix #7397: Remove error checks for noEmit and out* compiler options combined.
This commit is contained in:
Mohamed Hegazy 2016-03-12 12:33:42 -08:00
commit 74e498de03
13 changed files with 73 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/compiler/program.ts
View File

@ -1746,24 +1746,7 @@ namespace ts {
}
}
if (options.noEmit) {
if (options.out) {
programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "out"));
}
if (options.outFile) {
programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "outFile"));
}
if (options.outDir) {
programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "outDir"));
}
if (options.declaration) {
programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "declaration"));
}
}
else if (options.allowJs && options.declaration) {
if (!options.noEmit && options.allowJs && options.declaration) {
programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "allowJs", "declaration"));
}

6
tests/baselines/reference/compilerOptionsDeclarationAndNoEmit.symbols Normal file
View File

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

6
tests/baselines/reference/compilerOptionsDeclarationAndNoEmit.types Normal file
View File

@ -0,0 +1,6 @@
=== tests/cases/compiler/a.ts ===
class c {
>c : c
}

6
tests/baselines/reference/compilerOptionsOutAndNoEmit.symbols Normal file
View File

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

6
tests/baselines/reference/compilerOptionsOutAndNoEmit.types Normal file
View File

@ -0,0 +1,6 @@
=== tests/cases/compiler/a.ts ===
class c {
>c : c
}

6
tests/baselines/reference/compilerOptionsOutDirAndNoEmit.symbols Normal file
View File

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

6
tests/baselines/reference/compilerOptionsOutDirAndNoEmit.types Normal file
View File

@ -0,0 +1,6 @@
=== tests/cases/compiler/a.ts ===
class c {
>c : c
}

6
tests/baselines/reference/compilerOptionsOutFileAndNoEmit.symbols Normal file
View File

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

6
tests/baselines/reference/compilerOptionsOutFileAndNoEmit.types Normal file
View File

@ -0,0 +1,6 @@
=== tests/cases/compiler/a.ts ===
class c {
>c : c
}

6
tests/cases/compiler/compilerOptionsDeclarationAndNoEmit.ts Normal file
View File

@ -0,0 +1,6 @@
// @declaration: true
// @noEmit: true
// @fileName: a.ts
class c {
}

6
tests/cases/compiler/compilerOptionsOutAndNoEmit.ts Normal file
View File

@ -0,0 +1,6 @@
// @out: outDir
// @noEmit: true
// @fileName: a.ts
class c {
}

6
tests/cases/compiler/compilerOptionsOutDirAndNoEmit.ts Normal file
View File

@ -0,0 +1,6 @@
// @outDir: outDir
// @noEmit: true
// @fileName: a.ts
class c {
}

6
tests/cases/compiler/compilerOptionsOutFileAndNoEmit.ts Normal file
View File

@ -0,0 +1,6 @@
// @outFile: a.js
// @noEmit: true
// @fileName: a.ts
class c {
}