Merge pull request #783 from kufii/patch-1

set unicode escape sequences to constant.character.escape scope

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -507,7 +507,7 @@ repository:
     - include: '#binding-element-const'
     - include: '#punctuation-comma'
 
-  # When doing modication to parameter name, also modify expression-inside-possibly-arrow-parens where this is inlined so as to make 
+  # When doing modication to parameter name, also modify expression-inside-possibly-arrow-parens where this is inlined so as to make
   # as optional operator only if it is not followed by assignment or type annotation
   parameter-name:
     patterns:
@@ -2545,7 +2545,7 @@ repository:
 
   string-character-escape:
     name: constant.character.escape.ts
-    match: \\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)
+    match: \\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|u\{[0-9A-Fa-f]+\}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)
 
   template:
     patterns:

TypeScript.tmLanguage

@@ -7697,7 +7697,7 @@
         <key>name</key>
         <string>constant.character.escape.ts</string>
         <key>match</key>
-        <string>\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)</string>
+        <string>\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|u\{[0-9A-Fa-f]+\}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)</string>
       </dict>
       <key>template</key>
       <dict>

TypeScriptReact.tmLanguage

@@ -7645,7 +7645,7 @@
         <key>name</key>
         <string>constant.character.escape.tsx</string>
         <key>match</key>
-        <string>\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)</string>
+        <string>\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|u\{[0-9A-Fa-f]+\}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)</string>
       </dict>
       <key>template</key>
       <dict>

package-lock.json

@@ -0,0 +1,30 @@
+original file
+-----------------------------------
+var a = '\u1234 \u{1F600}'
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>var a = '\u1234 \u{1F600}'
+ ^^^
+ source.ts meta.var.expr.ts storage.type.ts
+    ^
+    source.ts meta.var.expr.ts
+     ^
+     source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
+      ^
+      source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+       ^
+       source.ts meta.var.expr.ts keyword.operator.assignment.ts
+        ^
+        source.ts meta.var.expr.ts
+         ^
+         source.ts meta.var.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts
+          ^^^^^^
+          source.ts meta.var.expr.ts string.quoted.single.ts constant.character.escape.ts
+                ^
+                source.ts meta.var.expr.ts string.quoted.single.ts
+                 ^^^^^^^^^
+                 source.ts meta.var.expr.ts string.quoted.single.ts constant.character.escape.ts
+                          ^
+                          source.ts meta.var.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts

tests/baselines/Issue782.baseline.txt

@@ -705,10 +705,10 @@ Grammar: TypeScriptReact.tmLanguage
                source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.embedded.expression.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx
                 ^^^^^^
                 source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.embedded.expression.tsx string.quoted.single.tsx
-                      ^^
+                      ^^^^^^
                       source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.embedded.expression.tsx string.quoted.single.tsx constant.character.escape.tsx
-                        ^^^^^^^^^^^
-                        source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.embedded.expression.tsx string.quoted.single.tsx
+                            ^^^^^^^
+                            source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.embedded.expression.tsx string.quoted.single.tsx
                                    ^
                                    source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.embedded.expression.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx
                                     ^

tests/baselines/TsxSamples.baseline.txt

@@ -0,0 +1 @@
+var a = '\u1234 \u{1F600}'