From 0c0d607087190bb5ec7f1c24a02f72bdf8651c96 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Mon, 4 Aug 2014 18:06:44 -0700
Subject: [PATCH] Removed duplicate messages from diagnosticMessages.json.

---
 .../diagnosticInformationMap.generated.ts     |  8 ++++----
 src/compiler/diagnosticMessages.json          | 20 -------------------
 ...ontShowCompilerGeneratedMembers.errors.txt |  4 ++--
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
index cc789bcca11..eaa87cb7aa2 100644
--- a/src/compiler/diagnosticInformationMap.generated.ts
+++ b/src/compiler/diagnosticInformationMap.generated.ts
@@ -8,9 +8,9 @@ module ts {
         Unrecognized_escape_sequence: { code: 1000, category: DiagnosticCategory.Error, key: "Unrecognized escape sequence." },
         Unexpected_character_0: { code: 1001, category: DiagnosticCategory.Error, key: "Unexpected character {0}." },
         Missing_close_quote_character: { code: 1002, category: DiagnosticCategory.Error, key: "Missing close quote character." },
-        Identifier_expected: { code: -9999999, category: DiagnosticCategory.Error, key: "Identifier expected." },
+        Identifier_expected: { code: 1003, category: DiagnosticCategory.Error, key: "Identifier expected." },
         _0_keyword_expected: { code: 1004, category: DiagnosticCategory.Error, key: "'{0}' keyword expected." },
-        _0_expected: { code: -9999999, category: DiagnosticCategory.Error, key: "'{0}' expected." },
+        _0_expected: { code: 1005, category: DiagnosticCategory.Error, key: "'{0}' expected." },
         Identifier_expected_0_is_a_keyword: { code: 1006, category: DiagnosticCategory.Error, key: "Identifier expected; '{0}' is a keyword." },
         Automatic_semicolon_insertion_not_allowed: { code: 1007, category: DiagnosticCategory.Error, key: "Automatic semicolon insertion not allowed." },
         Trailing_comma_not_allowed: { code: 1009, category: DiagnosticCategory.Error, key: "Trailing comma not allowed." },
@@ -93,8 +93,8 @@ module ts {
         A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: { code: 1105, category: DiagnosticCategory.Error, key: "A 'break' statement can only be used within an enclosing iteration or switch statement." },
         Jump_target_cannot_cross_function_boundary: { code: 1107, category: DiagnosticCategory.Error, key: "Jump target cannot cross function boundary." },
         A_return_statement_can_only_be_used_within_a_function_body: { code: 1108, category: DiagnosticCategory.Error, key: "A 'return' statement can only be used within a function body." },
-        Expression_expected: { code: -9999999, category: DiagnosticCategory.Error, key: "Expression expected." },
-        Type_expected: { code: -9999999, category: DiagnosticCategory.Error, key: "Type expected." },
+        Expression_expected: { code: 1109, category: DiagnosticCategory.Error, key: "Expression expected." },
+        Type_expected: { code: 1110, category: DiagnosticCategory.Error, key: "Type expected." },
         A_constructor_implementation_cannot_be_declared_in_an_ambient_context: { code: 1111, category: DiagnosticCategory.Error, key: "A constructor implementation cannot be declared in an ambient context." },
         A_class_member_cannot_be_declared_optional: { code: 1112, category: DiagnosticCategory.Error, key: "A class member cannot be declared optional." },
         A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: { code: 1113, category: DiagnosticCategory.Error, key: "A 'default' clause cannot appear more than once in a 'switch' statement." },
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index d60fd2e5c4f..2916f9f2db5 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1259,22 +1259,10 @@
         "category": "Error",
         "code": -9999999
     },
-    "'{0}' expected.": {
-        "category": "Error",
-        "code": -9999999
-    },
-    "Identifier expected.": {
-        "category": "Error",
-        "code": -9999999
-    },
     "String literal expected.": {
         "category": "Error",
         "code": -9999999
     },
-    "Type expected.": {
-        "category": "Error",
-        "code": -9999999
-    },
     "'=>' not preceded by parameter list.": {
         "category": "Error",
         "code": -9999999
@@ -1287,10 +1275,6 @@
         "category": "Error",
         "code": -9999999
     },
-    "Expression expected.": {
-        "category": "Error",
-        "code": -9999999
-    },
     "Line break not permitted here.": {
         "category": "Error",
         "code": -9999999
@@ -1363,10 +1347,6 @@
         "category": "Error",
         "code": -9999999
     },
-    "Only public methods of the base class are accessible via the 'super' keyword": {
-        "category": "Error",
-        "code": -9999999
-    },
     "Import name cannot be '{0}'": {
         "category": "Error",
         "code": -9999999
diff --git a/tests/baselines/reference/dontShowCompilerGeneratedMembers.errors.txt b/tests/baselines/reference/dontShowCompilerGeneratedMembers.errors.txt
index fdf27296612..b3745deb0bd 100644
--- a/tests/baselines/reference/dontShowCompilerGeneratedMembers.errors.txt
+++ b/tests/baselines/reference/dontShowCompilerGeneratedMembers.errors.txt
@@ -8,9 +8,9 @@
         ~
 !!! Type parameter list cannot be empty.
          ~
-!!! '(' expected.
-         ~
 !!! Type parameter declaration expected.
+         ~
+!!! '(' expected.
     };
     ~
 !!! Expression expected.
\ No newline at end of file