Skip to content

Commit 7ce774f

Browse files
sheetalkamatsheetalkamat
committed
Merge branch 'master' into restAndSpreadOperator
2 parents 67b3e04 + 3376784 commit 7ce774f

11 files changed

+316
-50
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ repository:
608608

609609
after-operator-block:
610610
name: meta.object-literal.ts
611-
begin: (?<=[=(:,\[?+!]|await|return|yield|throw|in|of|typeof|&&|\|\||\*)\s*(\{)
611+
begin: (?<=[=(,\[?+!]|await|return|yield|throw|in|of|typeof|&&|\|\||\*)\s*(\{)
612612
beginCaptures:
613613
'1': { name: punctuation.definition.block.ts }
614614
end: \}
@@ -944,6 +944,8 @@ repository:
944944
beginCaptures:
945945
'1': { name: keyword.control.switch.ts }
946946
end: ':'
947+
endCaptures:
948+
'0': { name: punctuation.definition.section.case-statement.ts }
947949
patterns:
948950
- include: '#expression'
949951

@@ -1363,7 +1365,7 @@ repository:
13631365
patterns:
13641366
- include: '#expression'
13651367
- name: meta.object.member.ts
1366-
match: ([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\})
1368+
match: ([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\}|$)
13671369
captures:
13681370
'1': { name: variable.other.readwrite.ts }
13691371
- include: '#punctuation-comma'

‎TypeScript.tmLanguage

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1998,7 +1998,7 @@
19981998
<key>name</key>
19991999
<string>meta.object-literal.ts</string>
20002000
<key>begin</key>
2001-
<string>(?&lt;=[=(:,\[?+!]|await|return|yield|throw|in|of|typeof|&amp;&amp;|\|\||\*)\s*(\{)</string>
2001+
<string>(?&lt;=[=(,\[?+!]|await|return|yield|throw|in|of|typeof|&amp;&amp;|\|\||\*)\s*(\{)</string>
20022002
<key>beginCaptures</key>
20032003
<dict>
20042004
<key>1</key>
@@ -2968,6 +2968,14 @@
29682968
</dict>
29692969
<key>end</key>
29702970
<string>:</string>
2971+
<key>endCaptures</key>
2972+
<dict>
2973+
<key>0</key>
2974+
<dict>
2975+
<key>name</key>
2976+
<string>punctuation.definition.section.case-statement.ts</string>
2977+
</dict>
2978+
</dict>
29712979
<key>patterns</key>
29722980
<array>
29732981
<dict>
@@ -3827,7 +3835,7 @@
38273835
<key>name</key>
38283836
<string>meta.object.member.ts</string>
38293837
<key>match</key>
3830-
<string>([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\})</string>
3838+
<string>([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\}|$)</string>
38313839
<key>captures</key>
38323840
<dict>
38333841
<key>1</key>

‎TypeScriptReact.tmLanguage

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2002,7 +2002,7 @@
20022002
<key>name</key>
20032003
<string>meta.object-literal.tsx</string>
20042004
<key>begin</key>
2005-
<string>(?&lt;=[=(:,\[?+!]|await|return|yield|throw|in|of|typeof|&amp;&amp;|\|\||\*)\s*(\{)</string>
2005+
<string>(?&lt;=[=(,\[?+!]|await|return|yield|throw|in|of|typeof|&amp;&amp;|\|\||\*)\s*(\{)</string>
20062006
<key>beginCaptures</key>
20072007
<dict>
20082008
<key>1</key>
@@ -2972,6 +2972,14 @@
29722972
</dict>
29732973
<key>end</key>
29742974
<string>:</string>
2975+
<key>endCaptures</key>
2976+
<dict>
2977+
<key>0</key>
2978+
<dict>
2979+
<key>name</key>
2980+
<string>punctuation.definition.section.case-statement.tsx</string>
2981+
</dict>
2982+
</dict>
29752983
<key>patterns</key>
29762984
<array>
29772985
<dict>
@@ -3809,7 +3817,7 @@
38093817
<key>name</key>
38103818
<string>meta.object.member.tsx</string>
38113819
<key>match</key>
3812-
<string>([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\})</string>
3820+
<string>([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\}|$)</string>
38133821
<key>captures</key>
38143822
<dict>
38153823
<key>1</key>

‎tests/baselines/Issue243.baseline.txt

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

‎tests/baselines/Issue292.baseline.txt

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
original file
2+
-----------------------------------
3+
const shellOptions: IOptions = {
4+
filesToOpen,
5+
filesToCreate,
6+
filesToDiff
7+
};
8+
const a = {
9+
filesToOpen: filesToOpen,
10+
filesToCreate: filesToCreate,
11+
filesToDiff: filesToDiff
12+
}
13+
-----------------------------------
14+
15+
Grammar: TypeScript.tmLanguage
16+
-----------------------------------
17+
> const shellOptions: IOptions = {
18+
^^^^
19+
source.ts
20+
^^^^^
21+
source.ts meta.var.expr.ts storage.type.ts
22+
^
23+
source.ts meta.var.expr.ts
24+
^^^^^^^^^^^^
25+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
26+
^
27+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
28+
^
29+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts
30+
^^^^^^^^
31+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts entity.name.type.ts
32+
^
33+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts
34+
^
35+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
36+
^
37+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
38+
^
39+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts
40+
^^
41+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
42+
> filesToOpen,
43+
^^^^^^^^
44+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
45+
^^^^^^^^^^^
46+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts variable.other.readwrite.ts
47+
^
48+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.separator.comma.ts
49+
^^
50+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
51+
> filesToCreate,
52+
^^^^^^^^
53+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
54+
^^^^^^^^^^^^^
55+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts variable.other.readwrite.ts
56+
^
57+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.separator.comma.ts
58+
^^
59+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
60+
> filesToDiff
61+
^^^^^^^^
62+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
63+
^^^^^^^^^^^
64+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts variable.other.readwrite.ts
65+
^^
66+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts
67+
> };
68+
^^^^
69+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
70+
^
71+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts
72+
^
73+
source.ts punctuation.terminator.statement.ts
74+
^^
75+
source.ts
76+
> const a = {
77+
^^^^
78+
source.ts
79+
^^^^^
80+
source.ts meta.var.expr.ts storage.type.ts
81+
^
82+
source.ts meta.var.expr.ts
83+
^
84+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
85+
^
86+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
87+
^
88+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
89+
^
90+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
91+
^
92+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts
93+
^^
94+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
95+
> filesToOpen: filesToOpen,
96+
^^^^^^^^
97+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
98+
^^^^^^^^^^^
99+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
100+
^
101+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
102+
^
103+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts
104+
^^^^^^^^^^^
105+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts variable.other.readwrite.ts
106+
^
107+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.separator.comma.ts
108+
^^
109+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
110+
> filesToCreate: filesToCreate,
111+
^^^^^^^^
112+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
113+
^^^^^^^^^^^^^
114+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
115+
^
116+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
117+
^
118+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts
119+
^^^^^^^^^^^^^
120+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts variable.other.readwrite.ts
121+
^
122+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.separator.comma.ts
123+
^^
124+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
125+
> filesToDiff: filesToDiff
126+
^^^^^^^^
127+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
128+
^^^^^^^^^^^
129+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
130+
^
131+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
132+
^
133+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts
134+
^^^^^^^^^^^
135+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts variable.other.readwrite.ts
136+
^^
137+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts
138+
> }
139+
^^^^
140+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts
141+
^
142+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts

‎tests/baselines/Issue294.baseline.txt

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
original file
2+
-----------------------------------
3+
switch (0) {
4+
case 0: {
5+
const zero = 0;
6+
return zero;
7+
}
8+
}
9+
-----------------------------------
10+
11+
Grammar: TypeScript.tmLanguage
12+
-----------------------------------
13+
>switch (0) {
14+
^^^^^^
15+
source.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts
16+
^
17+
source.ts switch-statement.expr.ts switch-expression.expr.ts
18+
^
19+
source.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
20+
^
21+
source.ts switch-statement.expr.ts switch-expression.expr.ts constant.numeric.decimal.ts
22+
^
23+
source.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
24+
^
25+
source.ts switch-statement.expr.ts
26+
^
27+
source.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts
28+
^^
29+
source.ts switch-statement.expr.ts switch-block.expr.ts
30+
> case 0: {
31+
^^^^
32+
source.ts switch-statement.expr.ts switch-block.expr.ts
33+
^^^^
34+
source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
35+
^
36+
source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
37+
^
38+
source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
39+
^
40+
source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts punctuation.definition.section.case-statement.ts
41+
^
42+
source.ts switch-statement.expr.ts switch-block.expr.ts
43+
^
44+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts punctuation.definition.block.ts
45+
^^
46+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts
47+
> const zero = 0;
48+
^^^^^^^^
49+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts
50+
^^^^^
51+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts storage.type.ts
52+
^
53+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts
54+
^^^^
55+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
56+
^
57+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
58+
^
59+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
60+
^
61+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
62+
^
63+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
64+
^
65+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts punctuation.terminator.statement.ts
66+
^^
67+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts
68+
> return zero;
69+
^^^^^^^^
70+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts
71+
^^^^^^
72+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts keyword.control.flow.ts
73+
^
74+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts
75+
^^^^
76+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts variable.other.readwrite.ts
77+
^
78+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts punctuation.terminator.statement.ts
79+
^^
80+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts
81+
> }
82+
^^^^
83+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts
84+
^
85+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts punctuation.definition.block.ts
86+
^^
87+
source.ts switch-statement.expr.ts switch-block.expr.ts
88+
>}
89+
^
90+
source.ts switch-statement.expr.ts punctuation.definition.block.ts

0 commit comments

Comments
 (0)