Address PR feedback: expand ternary return into if block, add check to ensure proper options usage

masaeedu · masaeedu · commit c8aedbf382b6 · 2016-02-22T20:45:04.000-05:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1670,6 +1670,10 @@ namespace ts {
                 }
             }
 
+            if (!options.declaration && options.declarationDir) {
+                programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "declarationDir", "declaration"));
+            }
+
             const languageVersion = options.target || ScriptTarget.ES3;
             const outFile = options.outFile || options.out;
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -2015,11 +2015,13 @@ namespace ts {
     export function getDeclarationEmitOutputFilePath(sourceFile: SourceFile, host: EmitHost) {
         const options = host.getCompilerOptions();
         const outputDir = options.declarationDir || options.outDir; // Prefer declaration folder if specified
-        return options.declaration ? removeFileExtension(
-            outputDir
+
+        if (options.declaration) {
+            const path = outputDir
                 ? getSourceFilePathInNewDir(sourceFile, host, outputDir)
-                : sourceFile.fileName
-        ) + ".d.ts" : undefined;
+                : sourceFile.fileName;
+            return removeFileExtension(path) + ".d.ts";
+        }
     }
 
     export function getEmitScriptTarget(compilerOptions: CompilerOptions) {

Original file line number	Diff line number	Diff line change
`@@ -1670,6 +1670,10 @@ 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"));`
	`1675`	`+ }`
	`1676`	`+`
`1673`	`1677`	`const languageVersion = options.target \|\| ScriptTarget.ES3;`
`1674`	`1678`	`const outFile = options.outFile \|\| options.out;`
`1675`	`1679`