Make declarationDir invalid alongside out or outFile

masaeedu · masaeedu · commit f251768f32a9 · 2016-02-23T17:45:45.000-05:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1670,8 +1670,13 @@ namespace ts {
                 }
             }
 
-            if (!options.declaration && options.declarationDir) {
-                programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "declarationDir", "declaration"));
+            if (options.declarationDir) {
+                if (!options.declaration) {
+                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "declarationDir", "declaration"));
+                }
+                if (options.out || options.outFile) {
+                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "declarationDir", options.out ? "out" : "outFile"));
+                }
             }
 
             const languageVersion = options.target || ScriptTarget.ES3;

Original file line number	Diff line number	Diff line change
`@@ -1670,8 +1670,13 @@ namespace ts {`
`1670`	`1670`	`}`
`1671`	`1671`	`}`
`1672`	`1672`
`1673`		`- if (!options.declaration && options.declarationDir) {`
`1674`		`- programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "declarationDir", "declaration"));`
	`1673`	`+ if (options.declarationDir) {`
	`1674`	`+ if (!options.declaration) {`
	`1675`	`+ programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "declarationDir", "declaration"));`
	`1676`	`+ }`
	`1677`	`+ if (options.out \|\| options.outFile) {`
	`1678`	`+ programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "declarationDir", options.out ? "out" : "outFile"));`
	`1679`	`+ }`
`1675`	`1680`	`}`
`1676`	`1681`
`1677`	`1682`	`const languageVersion = options.target \|\| ScriptTarget.ES3;`