Skip to content

Commit a87cde2

Browse files
committed
Renaming the scope name of object-literal to objectliteral
This is to make sure vscode injection scope selection doesnt fail.
1 parent c5c0e6e commit a87cde2

30 files changed

+884
-884
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ repository:
583583
'5': { name: meta.definition.function.ts entity.name.function.ts }
584584

585585
object-literal:
586-
name: meta.object-literal.ts
586+
name: meta.objectliteral.ts
587587
begin: \{
588588
beginCaptures:
589589
'0': { name: punctuation.definition.block.ts }
@@ -605,7 +605,7 @@ repository:
605605
- include: '#statements'
606606

607607
after-operator-block:
608-
name: meta.object-literal.ts
608+
name: meta.objectliteral.ts
609609
begin: (?<=[=(,\[?+!]|await|return|yield|throw|in|of|typeof|&&|\|\||\*)\s*(\{)
610610
beginCaptures:
611611
'1': { name: punctuation.definition.block.ts }

TypeScript.tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1933,7 +1933,7 @@
19331933
<key>object-literal</key>
19341934
<dict>
19351935
<key>name</key>
1936-
<string>meta.object-literal.ts</string>
1936+
<string>meta.objectliteral.ts</string>
19371937
<key>begin</key>
19381938
<string>\{</string>
19391939
<key>beginCaptures</key>
@@ -1997,7 +1997,7 @@
19971997
<key>after-operator-block</key>
19981998
<dict>
19991999
<key>name</key>
2000-
<string>meta.object-literal.ts</string>
2000+
<string>meta.objectliteral.ts</string>
20012001
<key>begin</key>
20022002
<string>(?&lt;=[=(,\[?+!]|await|return|yield|throw|in|of|typeof|&amp;&amp;|\|\||\*)\s*(\{)</string>
20032003
<key>beginCaptures</key>

TypeScriptReact.tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1937,7 +1937,7 @@
19371937
<key>object-literal</key>
19381938
<dict>
19391939
<key>name</key>
1940-
<string>meta.object-literal.tsx</string>
1940+
<string>meta.objectliteral.tsx</string>
19411941
<key>begin</key>
19421942
<string>\{</string>
19431943
<key>beginCaptures</key>
@@ -2001,7 +2001,7 @@
20012001
<key>after-operator-block</key>
20022002
<dict>
20032003
<key>name</key>
2004-
<string>meta.object-literal.tsx</string>
2004+
<string>meta.objectliteral.tsx</string>
20052005
<key>begin</key>
20062006
<string>(?&lt;=[=(,\[?+!]|await|return|yield|throw|in|of|typeof|&amp;&amp;|\|\||\*)\s*(\{)</string>
20072007
<key>beginCaptures</key>

tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt

Lines changed: 77 additions & 77 deletions
Large diffs are not rendered by default.

tests/baselines/ArrowFunctionInsideTypeAssertion.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ Grammar: TypeScript.tmLanguage
3333
>var object = {
3434
> setTransform: <(domNode: HTMLElement, desiredValue: string) => void>null,
3535
^
36-
[5, 19]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts
36+
[5, 19]: source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts
3737
^
38-
[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
38+
[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
3939
^^^^^^^
40-
[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
40+
[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
4141
^^^^^^^^^^^
42-
[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
42+
[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
4343
^^^^^^^^^^^^
44-
[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
44+
[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
4545
^^^^^^
46-
[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
46+
[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
4747
^^
48-
[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
48+
[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
4949
^^^^
50-
[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
50+
[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
5151
^^^^
52-
[5, 73]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts constant.language.null.ts
52+
[5, 73]: source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts constant.language.null.ts
5353
> setDisplay: (domNode: HTMLElement, desiredValue: string) => {
5454
> if (domNode.style.display !== desiredValue) {
5555
> domNode.style.display = desiredValue;

0 commit comments

Comments
 (0)