Renaming the scope name of object-literal to objectliteral

This is to make sure vscode injection scope selection doesnt fail.
microsoft · Oct 21, 2016 · a87cde2 · a87cde2
1 parent c5c0e6e
commit a87cde2
Show file tree

Hide file tree

Showing 30 changed files with 884 additions and 884 deletions.
diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage
@@ -583,7 +583,7 @@ repository:
       '5': { name: meta.definition.function.ts entity.name.function.ts }
 
   object-literal:
-    name: meta.object-literal.ts
+    name: meta.objectliteral.ts
     begin: \{
     beginCaptures:
       '0': { name: punctuation.definition.block.ts }
@@ -605,7 +605,7 @@ repository:
     - include: '#statements'
 
   after-operator-block:
-    name: meta.object-literal.ts
+    name: meta.objectliteral.ts
     begin: (?<=[=(,\[?+!]|await|return|yield|throw|in|of|typeof|&&|\|\||\*)\s*(\{)
     beginCaptures:
       '1': { name: punctuation.definition.block.ts }

diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage
@@ -1933,7 +1933,7 @@
       <key>object-literal</key>
       <dict>
         <key>name</key>
-        <string>meta.object-literal.ts</string>
+        <string>meta.objectliteral.ts</string>
         <key>begin</key>
         <string>\{</string>
         <key>beginCaptures</key>
@@ -1997,7 +1997,7 @@
       <key>after-operator-block</key>
       <dict>
         <key>name</key>
-        <string>meta.object-literal.ts</string>
+        <string>meta.objectliteral.ts</string>
         <key>begin</key>
         <string>(?&lt;=[=(,\[?+!]|await|return|yield|throw|in|of|typeof|&amp;&amp;|\|\||\*)\s*(\{)</string>
         <key>beginCaptures</key>

diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage
@@ -1937,7 +1937,7 @@
       <key>object-literal</key>
       <dict>
         <key>name</key>
-        <string>meta.object-literal.tsx</string>
+        <string>meta.objectliteral.tsx</string>
         <key>begin</key>
         <string>\{</string>
         <key>beginCaptures</key>
@@ -2001,7 +2001,7 @@
       <key>after-operator-block</key>
       <dict>
         <key>name</key>
-        <string>meta.object-literal.tsx</string>
+        <string>meta.objectliteral.tsx</string>
         <key>begin</key>
         <string>(?&lt;=[=(,\[?+!]|await|return|yield|throw|in|of|typeof|&amp;&amp;|\|\||\*)\s*(\{)</string>
         <key>beginCaptures</key>

diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt
diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.txt
@@ -33,23 +33,23 @@ Grammar: TypeScript.tmLanguage
 >var object = {
 >    setTransform: <(domNode: HTMLElement, desiredValue: string) => void>null,
                    ^
-                   [5, 19]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts 
+                   [5, 19]: source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts 
                     ^
-                    [5, 20]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts 
+                    [5, 20]: source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts 
                      ^^^^^^^
-                     [5, 21]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts variable.parameter.ts 
+                     [5, 21]: source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts variable.parameter.ts 
                               ^^^^^^^^^^^
-                              [5, 30]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts 
+                              [5, 30]: source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts 
                                            ^^^^^^^^^^^^
-                                           [5, 43]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts variable.parameter.ts 
+                                           [5, 43]: source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts variable.parameter.ts 
                                                          ^^^^^^
-                                                         [5, 57]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts 
+                                                         [5, 57]: source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts 
                                                                  ^^
-                                                                 [5, 65]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts storage.type.function.arrow.ts 
+                                                                 [5, 65]: source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts storage.type.function.arrow.ts 
                                                                     ^^^^
-                                                                    [5, 68]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts 
+                                                                    [5, 68]: source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts 
                                                                          ^^^^
-                                                                         [5, 73]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts constant.language.null.ts 
+                                                                         [5, 73]: source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts constant.language.null.ts 
 >    setDisplay: (domNode: HTMLElement, desiredValue: string) => {
 >        if (domNode.style.display !== desiredValue) {
 >            domNode.style.display = desiredValue;