Merge pull request microsoft#5835 from Microsoft/noEmit

sheetalkamat · sheetalkamat · commit 0c8aa41b262b · 2015-12-01T14:34:28.000-08:00
Do not emit files if noEmit is specified
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
@@ -1675,7 +1675,7 @@ namespace ts {
     /* @internal */
     export function writeDeclarationFile(declarationFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean, host: EmitHost, resolver: EmitResolver, emitterDiagnostics: DiagnosticCollection) {
         const emitDeclarationResult = emitDeclarations(host, resolver, emitterDiagnostics, declarationFilePath, sourceFiles, isBundledEmit);
-        const emitSkipped = emitDeclarationResult.reportedDeclarationError || host.isEmitBlocked(declarationFilePath);
+        const emitSkipped = emitDeclarationResult.reportedDeclarationError || host.isEmitBlocked(declarationFilePath) || host.getCompilerOptions().noEmit;
         if (!emitSkipped) {
             const declarationOutput = emitDeclarationResult.referencePathsOutput
                 + getDeclarationOutput(emitDeclarationResult.synchronousDeclarationOutput, emitDeclarationResult.moduleElementDeclarationEmitInfo);
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -7823,7 +7823,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
         function emitFile({ jsFilePath, sourceMapFilePath, declarationFilePath}: { jsFilePath: string, sourceMapFilePath: string, declarationFilePath: string },
             sourceFiles: SourceFile[], isBundledEmit: boolean) {
             // Make sure not to write js File and source map file if any of them cannot be written
-            if (!host.isEmitBlocked(jsFilePath)) {
+            if (!host.isEmitBlocked(jsFilePath) && !compilerOptions.noEmit) {
                 emitJavaScript(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);
             }
             else {
diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts
@@ -142,7 +142,7 @@ class CompilerBaselineRunner extends RunnerBase {
 
             it("Correct JS output for " + fileName, () => {
                 if (hasNonDtsFiles && this.emit) {
-                    if (result.files.length === 0 && result.errors.length === 0) {
+                    if (!options.noEmit && result.files.length === 0 && result.errors.length === 0) {
                         throw new Error("Expected at least one js file to be emitted or at least one error to be created.");
                     }
 
diff --git a/tests/baselines/reference/jsFileCompilationBindErrors.js b/tests/baselines/reference/jsFileCompilationBindErrors.js

Original file line number	Diff line number	Diff line change
`@@ -7823,7 +7823,7 @@ var __awaiter = (this && this.__awaiter) \|\| function (thisArg, _arguments, Promi`
`7823`	`7823`	`function emitFile({ jsFilePath, sourceMapFilePath, declarationFilePath}: { jsFilePath: string, sourceMapFilePath: string, declarationFilePath: string },`
`7824`	`7824`	`sourceFiles: SourceFile[], isBundledEmit: boolean) {`
`7825`	`7825`	`// Make sure not to write js File and source map file if any of them cannot be written`
`7826`		`- if (!host.isEmitBlocked(jsFilePath)) {`
	`7826`	`+ if (!host.isEmitBlocked(jsFilePath) && !compilerOptions.noEmit) {`
`7827`	`7827`	`emitJavaScript(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);`
`7828`	`7828`	`}`
`7829`	`7829`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ class CompilerBaselineRunner extends RunnerBase {`
`142`	`142`
`143`	`143`	`it("Correct JS output for " + fileName, () => {`
`144`	`144`	`if (hasNonDtsFiles && this.emit) {`
`145`		`- if (result.files.length === 0 && result.errors.length === 0) {`
	`145`	`+ if (!options.noEmit && result.files.length === 0 && result.errors.length === 0) {`
`146`	`146`	`throw new Error("Expected at least one js file to be emitted or at least one error to be created.");`
`147`	`147`	`}`
`148`	`148`