From bd2c5965f524aad1db66612cb7120a56045fc6d2 Mon Sep 17 00:00:00 2001
From: Dick van den Brink <d_vandenbrink@outlook.com>
Date: Mon, 27 Oct 2014 20:48:46 +0100
Subject: [PATCH] Changed name to noEmitOnError

---
 src/compiler/commandLineParser.ts                  | 10 +++++-----
 src/compiler/diagnosticInformationMap.generated.ts |  2 +-
 src/compiler/diagnosticMessages.json               |  2 +-
 src/compiler/tsc.ts                                |  2 +-
 src/compiler/types.ts                              |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 210c71541f3..ad6452d1639 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -54,6 +54,11 @@ module ts {
             paramType: Diagnostics.KIND,
             error: Diagnostics.Argument_for_module_option_must_be_commonjs_or_amd
         },
+        {
+            name: "noEmitOnError",
+            type: "boolean",
+            description: Diagnostics.Do_not_emit_JavaScript_on_error,
+        },
         {
             name: "noImplicitAny",
             type: "boolean",
@@ -113,11 +118,6 @@ module ts {
             type: "boolean",
             description: Diagnostics.Print_the_compiler_s_version,
         },
-        {
-            name: "warnAsError",
-            type: "boolean",
-            description: Diagnostics.Report_all_warnings_as_errors,
-        },
         {
             name: "watch",
             shortName: "w",
diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
index 5ab076413cc..3e464e62c33 100644
--- a/src/compiler/diagnosticInformationMap.generated.ts
+++ b/src/compiler/diagnosticInformationMap.generated.ts
@@ -364,7 +364,7 @@ module ts {
         Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: DiagnosticCategory.Message, key: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
         Watch_input_files: { code: 6005, category: DiagnosticCategory.Message, key: "Watch input files." },
         Redirect_output_structure_to_the_directory: { code: 6006, category: DiagnosticCategory.Message, key: "Redirect output structure to the directory." },
-        Report_all_warnings_as_errors: { code: 6007, category: DiagnosticCategory.Message, key: "Report all warnings as errors." },
+        Do_not_emit_JavaScript_on_error: { code: 6007, category: DiagnosticCategory.Message, key: "Do not emit JavaScript on error." },
         Do_not_emit_comments_to_output: { code: 6009, category: DiagnosticCategory.Message, key: "Do not emit comments to output." },
         Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental: { code: 6015, category: DiagnosticCategory.Message, key: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES6' (experimental)" },
         Specify_module_code_generation_Colon_commonjs_or_amd: { code: 6016, category: DiagnosticCategory.Message, key: "Specify module code generation: 'commonjs' or 'amd'" },
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 2442d21d206..94bbe966f30 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1456,7 +1456,7 @@
         "category": "Message",
         "code": 6006
     },
-    "Report all warnings as errors.": {
+    "Do not emit JavaScript on error.": {
         "category": "Message",
         "code": 6007
     },
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
index dff2ac8d0b1..e578448457e 100644
--- a/src/compiler/tsc.ts
+++ b/src/compiler/tsc.ts
@@ -362,7 +362,7 @@ module ts {
             var checker = program.getTypeChecker(/*fullTypeCheckMode*/ true);
             var checkStart = new Date().getTime();
             errors = checker.getDiagnostics();
-            if (checker.hasEarlyErrors() || (compilerOptions.warnAsError && errors.length > 0)) {
+            if (checker.hasEarlyErrors() || (compilerOptions.noEmitOnError && errors.length > 0)) {
                 exitStatus = EmitReturnStatus.AllOutputGenerationSkipped;
             }
             else {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index d96a50b8e84..07b230976ed 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -1080,6 +1080,7 @@ module ts {
         locale?: string;
         mapRoot?: string;
         module?: ModuleKind;
+        noEmitOnError?: boolean;
         noErrorTruncation?: boolean;
         noImplicitAny?: boolean;
         noLib?: boolean;
@@ -1092,7 +1093,6 @@ module ts {
         sourceRoot?: string;
         target?: ScriptTarget;
         version?: boolean;
-        warnAsError?: boolean;
         watch?: boolean;
         [option: string]: any;
     }