Change getEmitOutputBaseline

Author: Yui T

src/harness/fourslash.ts

@@ -182,7 +182,6 @@ module FourSlash {
                     case testOptMetadataNames.sourceRoot:
                         settings.sourceRoot = globalOptions[prop];
                         break;
-                    
                 }
             }
         }
@@ -983,29 +982,9 @@ module FourSlash {
                     emitFiles.forEach(emitFile => {
                         var emitOutput = this.languageService.getEmitOutput(emitFile.fileName);
                         var emitOutputStatus = emitOutput.emitOutputStatus;
-
                         // Print emitOutputStatus in readable format
-                        switch (emitOutputStatus) {
-                            case ts.EmitReturnStatus.Succeeded:
-                                resultString += "EmitOutputStatus : Succeeded\n";
-                                break;
-                            case ts.EmitReturnStatus.AllOutputGenerationSkipped:
-                                resultString += "EmitOutputStatus : AllOutputGenerationSkipped\n";
-                                break;
-                            case ts.EmitReturnStatus.JSGeneratedWithSemanticErrors:
-                                resultString += "EmitOutputStatus : JSGeneratedWithSemanticErrors\n";
-                                break;
-                            case ts.EmitReturnStatus.DeclarationGenerationSkipped:
-                                resultString += "EmitOutputStatus : DeclaratiionGenerationSkipped\n";
-                                break;
-                            case ts.EmitReturnStatus.EmitErrorsEncountered:
-                                resultString += "EmitOutputStatus : EmitErrorEncountered\n";
-                                break;
-                            default:
-                                resultString += "Invalid EmitOutputStatus\n";
-                                break;
-                        }
-
+                        resultString += "EmitOutputStatus : " + ts.EmitReturnStatus[emitOutputStatus];
+                        resultString += "\n";
                         emitOutput.outputFiles.forEach((outputFile, idx, array) => {
                             var filename = "Filename : " + outputFile.name + "\n";
                             resultString = resultString + filename + outputFile.text;

src/services/services.ts

@@ -1413,7 +1413,7 @@ module ts {
                 getNewLine: () => "\r\n",
                 getDefaultLibFilename: (): string => {
                     // In the case there is no host (such as in fourslash test), return ""
-                    return this.host !== undefined ? this.host.getDefaultLibFilename() : "";
+                    return host.getDefaultLibFilename();
                 },
                 writeFile: (filename, data, writeByteOrderMark) => {
                     if (writer !== undefined) {
@@ -1422,7 +1422,7 @@ module ts {
                 },
                 getCurrentDirectory: (): string => {
                     // In the case there is no host (such as in fourslash test), return ""
-                    return this.host !== undefined ? this.host.getCurrentDirectory() : "";
+                    return host.getCurrentDirectory();
                 }
             };
         }
@@ -2869,11 +2869,12 @@ module ts {
             } else {
                 // Check the syntactic of only sourceFiles that will get emitted into single output
                 // Terminate the process immediately if we encounter a syntax error from one of the sourceFiles
-                containSyntacticErrors = program.getSourceFiles().some((sourceFile) => {
+                containSyntacticErrors = forEach(program.getSourceFiles(), sourceFile => {
                     if (!isExternalModuleOrDeclarationFile(sourceFile)) {
                         // If emit to a single file then we will check all files that do not have external module
                         return containErrors(program.getDiagnostics(sourceFile));
                     }
+                    return false;
                 });
             }
 

tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline

@@ -1,4 +1,4 @@
-EmitOutputStatus : EmitErrorEncountered
+EmitOutputStatus : EmitErrorsEncountered
 Filename : tests/cases/fourslash/inputFile.js
 var M;
 (function (M) {

tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline

@@ -1,4 +1,4 @@
-EmitOutputStatus : EmitErrorEncountered
+EmitOutputStatus : EmitErrorsEncountered
 Filename : tests/cases/fourslash/inputFile.js
 define(["require", "exports"], function (require, exports) {
     var C = (function () {

tests/baselines/reference/getEmitOutputWithSemanticErrors2.baseline

@@ -1,4 +1,4 @@
-EmitOutputStatus : DeclaratiionGenerationSkipped
+EmitOutputStatus : DeclarationGenerationSkipped
 Filename : tests/cases/fourslash/inputFile.js
 var x = "hello world";