Fixed error message.

microsoft · Mar 2, 2015 · 6be13a9 · 6be13a9 · CyrusNajmabadi · Mar 2, 2015
1 parent b1837c8
commit 6be13a9
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
@@ -156,7 +156,7 @@ module ts {
         Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: DiagnosticCategory.Error, key: "Catch clause variable cannot have a type annotation." },
         Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: DiagnosticCategory.Error, key: "Catch clause variable cannot have an initializer." },
         An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: DiagnosticCategory.Error, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
-        expected: { code: 1199, category: DiagnosticCategory.Error, key: "'}' expected." },
+        Unterminated_Unicode_escape_sequence: { code: 1199, category: DiagnosticCategory.Error, key: "Unterminated Unicode escape sequence." },
         Duplicate_identifier_0: { code: 2300, category: DiagnosticCategory.Error, key: "Duplicate identifier '{0}'." },
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: DiagnosticCategory.Error, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
         Static_members_cannot_reference_class_type_parameters: { code: 2302, category: DiagnosticCategory.Error, key: "Static members cannot reference class type parameters." },

diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -615,7 +615,7 @@
         "category": "Error",
         "code": 1198
     },
-    "'}' expected.": {
+    "Unterminated Unicode escape sequence.": {
         "category": "Error",
         "code":  1199
     },

diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -848,7 +848,7 @@ module ts {
                 pos++;
             }
             else {
-                error(Diagnostics.expected); // '}' expected.
+                error(Diagnostics.Unterminated_Unicode_escape_sequence);
                 isInvalidExtendedEscape = true;
             }
 

diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts(2,15): error TS1199: '}' expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts(2,15): error TS1199: Unterminated Unicode escape sequence.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts (1 errors) ====
 
     var x = "\u{67";
 
-!!! error TS1199: '}' expected.
+!!! error TS1199: Unterminated Unicode escape sequence.
 
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts(2,15): error TS1199: '}' expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts(2,15): error TS1199: Unterminated Unicode escape sequence.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts (1 errors) ====
 
     var x = "\u{67";
 
-!!! error TS1199: '}' expected.
+!!! error TS1199: Unterminated Unicode escape sequence.
 
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts(2,27): error TS1199: '}' expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts(2,27): error TS1199: Unterminated Unicode escape sequence.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts (1 errors) ====
 
     var x = "\u{00000000000067";
 
-!!! error TS1199: '}' expected.
+!!! error TS1199: Unterminated Unicode escape sequence.
 
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts(2,27): error TS1199: '}' expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts(2,27): error TS1199: Unterminated Unicode escape sequence.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts (1 errors) ====
 
     var x = "\u{00000000000067";
 
-!!! error TS1199: '}' expected.
+!!! error TS1199: Unterminated Unicode escape sequence.
 
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts(2,27): error TS1199: '}' expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts(2,27): error TS1199: Unterminated Unicode escape sequence.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts (1 errors) ====
 
     var x = "\u{00000000000067
 
-!!! error TS1199: '}' expected.
+!!! error TS1199: Unterminated Unicode escape sequence.
 
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts(2,27): error TS1199: '}' expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts(2,27): error TS1199: Unterminated Unicode escape sequence.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts (1 errors) ====
 
     var x = "\u{00000000000067
 
-!!! error TS1199: '}' expected.
+!!! error TS1199: Unterminated Unicode escape sequence.
-Original file line number
+Diff line change
@@ Expand Up / @@ -848,7 +848,7 @@ module ts { @@
                     pos++;
                 }
                 else {
-                    error(Diagnostics.expected); // '}' expected.
+                    error(Diagnostics.Unterminated_Unicode_escape_sequence);
                     isInvalidExtendedEscape = true;
                 }
@@ Expand Down @@