From 94e788c737015eb7bb4f47f42c611d655449cd28 Mon Sep 17 00:00:00 2001
From: Yui T <yuisu@microsoft.com>
Date: Mon, 22 Sep 2014 09:43:47 -0700
Subject: [PATCH] Address code review

---
 src/compiler/tsc.ts   | 31 +++++++++++++++++--------------
 src/compiler/types.ts |  4 ++--
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
index 30428568d5..42c0953eec 100644
--- a/src/compiler/tsc.ts
+++ b/src/compiler/tsc.ts
@@ -199,8 +199,9 @@ module ts {
 
     export function executeCommandLine(args: string[]): void {
         var commandLine = parseCommandLine(args);
+        var compilerOptions = commandLine.options;
 
-        if (commandLine.options.locale) {
+        if (compilerOptions.locale) {
             validateLocaleAndSetLanguage(commandLine.options.locale, commandLine.errors);
         }
 
@@ -211,20 +212,26 @@ module ts {
             return sys.exit(EmitReturnStatus.CompilerOptionsErrors);
         }
 
-        if (commandLine.options.version) {
+        if (compilerOptions.version) {
             reportDiagnostic(createCompilerDiagnostic(Diagnostics.Version_0, version));
-            return sys.exit(EmitReturnStatus.CompilerOptionsErrors);
+            return sys.exit(EmitReturnStatus.Succeeded);
         }
 
-        if (commandLine.options.help || commandLine.filenames.length === 0) {
+        if (compilerOptions.help) {
+            printVersion();
+            printHelp();
+            return sys.exit(EmitReturnStatus.Succeeded);
+        }
+
+        if (commandLine.filenames.length === 0) {
             printVersion();
             printHelp();
             return sys.exit(EmitReturnStatus.CompilerOptionsErrors);
         }
 
-        var defaultCompilerHost = createCompilerHost(commandLine.options);
+        var defaultCompilerHost = createCompilerHost(compilerOptions);
         
-        if (commandLine.options.watch) {
+        if (compilerOptions.watch) {
             if (!sys.watchFile) {
                 reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"));
                 return sys.exit(EmitReturnStatus.CompilerOptionsErrors);
@@ -332,14 +339,14 @@ module ts {
         var program = createProgram(commandLine.filenames, compilerOptions, compilerHost);
 
         var bindStart = new Date().getTime();
-        var syntacticErrors = program.getDiagnostics();
-        var errors: Diagnostic[];
+        var errors: Diagnostic[] = program.getDiagnostics();
         var exitStatus: EmitReturnStatus;
 
-        if (syntacticErrors.length) {
+        if (errors.length) {
             var checkStart = bindStart;
             var emitStart = bindStart;
             var reportStart = bindStart;
+            exitStatus = EmitReturnStatus.AllOutputGenerationSkipped;
         }
         else {
             var checker = program.getTypeChecker(/*fullTypeCheckMode*/ true);
@@ -350,7 +357,7 @@ module ts {
             var emitErrors = emitOutput.errors;
             exitStatus = emitOutput.emitResultStatus;
             var reportStart = new Date().getTime();
-            errors = concatenate(syntacticErrors, concatenate(semanticErrors, emitErrors));
+            errors = concatenate(semanticErrors, emitErrors);
         }
 
         reportDiagnostics(errors);
@@ -372,10 +379,6 @@ module ts {
             reportTimeStatistic("Total time", reportStart - parseStart);
         }
 
-        // Check if there exists syntactic errors
-        if (syntacticErrors.length > 0) {
-            exitStatus = EmitReturnStatus.AllOutputGenerationSkipped;
-        } 
         return { program: program, exitStatus: exitStatus }
     }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index af41855154..8bb1cfa416 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -603,11 +603,11 @@ module ts {
     // Return code used by getEmitOutput function to indicate status of the function
     export enum EmitReturnStatus {
         Succeeded = 0,                      // All outputs generated as requested (.js, .map, .d.ts), no errors reported
-        AllOutputGenerationSkipped = 1,     // No .js generated because of syntax errors, or compiler options errors, nothing generated
+        AllOutputGenerationSkipped = 1,     // No .js generated because of syntax errors, nothing generated
         JSGeneratedWithSemanticErrors = 2,  // .js and .map generated with semantic errors
         DeclarationGenerationSkipped = 3,   // .d.ts generation skipped because of semantic errors or declaration emitter specific errors; Output .js with semantic errors
         EmitErrorsEncountered = 4,          // Emitter errors occurred during emitting process
-        CompilerOptionsErrors = 5,          // Errors occurred in parsing compiler options
+        CompilerOptionsErrors = 5,          // Errors occurred in parsing compiler options, nothing generated
     }
 
     export interface EmitResult {