Skip to content

Commit 84a4e42

Browse files
sheetalkamatsheetalkamat
committed
Scope '.' accessor
1 parent 8170e06 commit 84a4e42

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+826
-284
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ repository:
178178
- include: '#function-call'
179179
- include: '#paren-expression'
180180
- include: '#punctuation-comma'
181+
- include: '#punctuation-accessor'
181182

182183
control-statement:
183184
# TODO: convert this to actual statements instead
@@ -1083,6 +1084,10 @@ repository:
10831084
name: punctuation.terminator.statement.ts
10841085
match: ';'
10851086

1087+
punctuation-accessor:
1088+
name: punctuation.accessor.ts
1089+
match: '\.'
1090+
10861091
paren-expression:
10871092
begin: \(
10881093
beginCaptures:

‎TypeScript.tmLanguage

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,6 +1244,10 @@
12441244
<key>include</key>
12451245
<string>#punctuation-comma</string>
12461246
</dict>
1247+
<dict>
1248+
<key>include</key>
1249+
<string>#punctuation-accessor</string>
1250+
</dict>
12471251
</array>
12481252
</dict>
12491253
<key>expression-operator</key>
@@ -2884,6 +2888,13 @@
28842888
<key>name</key>
28852889
<string>storage.type.property.ts</string>
28862890
</dict>
2891+
<key>punctuation-accessor</key>
2892+
<dict>
2893+
<key>match</key>
2894+
<string>\.</string>
2895+
<key>name</key>
2896+
<string>punctuation.accessor.ts</string>
2897+
</dict>
28872898
<key>punctuation-comma</key>
28882899
<dict>
28892900
<key>match</key>

‎TypeScriptReact.YAML-tmLanguage

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ repository:
182182
- include: '#function-call'
183183
- include: '#paren-expression'
184184
- include: '#punctuation-comma'
185+
- include: '#punctuation-accessor'
185186

186187
control-statement:
187188
# TODO: convert this to actual statements instead
@@ -1072,6 +1073,10 @@ repository:
10721073
name: punctuation.terminator.statement.tsx
10731074
match: ';'
10741075

1076+
punctuation-accessor:
1077+
name: punctuation.accessor.tsx
1078+
match: '\.'
1079+
10751080
paren-expression:
10761081
begin: \(
10771082
beginCaptures:

‎TypeScriptReact.tmLanguage

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,6 +1212,10 @@
12121212
<key>include</key>
12131213
<string>#punctuation-comma</string>
12141214
</dict>
1215+
<dict>
1216+
<key>include</key>
1217+
<string>#punctuation-accessor</string>
1218+
</dict>
12151219
</array>
12161220
</dict>
12171221
<key>expression-operator</key>
@@ -3270,6 +3274,13 @@
32703274
<key>name</key>
32713275
<string>storage.type.property.tsx</string>
32723276
</dict>
3277+
<key>punctuation-accessor</key>
3278+
<dict>
3279+
<key>match</key>
3280+
<string>\.</string>
3281+
<key>name</key>
3282+
<string>punctuation.accessor.tsx</string>
3283+
</dict>
32733284
<key>punctuation-comma</key>
32743285
<dict>
32753286
<key>match</key>

‎tests/baselines/Abstracts.baseline.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ cow.makeSound();
8383
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
8484
^^^^
8585
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
86-
^^^^
87-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
86+
^
87+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
88+
^^^
89+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
8890
^
8991
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
9092
^
@@ -256,8 +258,10 @@ cow.makeSound();
256258
^
257259
source.ts punctuation.terminator.statement.ts
258260
>cow.makeSound();
259-
^^^^
261+
^^^
260262
source.ts
263+
^
264+
source.ts punctuation.accessor.ts
261265
^^^^^^^^^
262266
source.ts entity.name.function.ts
263267
^

‎tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,16 @@ function f(x: string | ((value: string) => number)) {
140140
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts
141141
^
142142
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.brace.round.ts
143-
^^^^^^^^^^^^^^^^^^^^^^
143+
^^^^^^^
144144
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts
145+
^
146+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts punctuation.accessor.ts
147+
^^^^^
148+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts
149+
^
150+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts punctuation.accessor.ts
151+
^^^^^^^^
152+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts
145153
^^^
146154
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts keyword.operator.comparison.ts
147155
^^^^^^^^^^^^^
@@ -153,8 +161,16 @@ function f(x: string | ((value: string) => number)) {
153161
^
154162
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts punctuation.definition.block.ts
155163
> domNode.style.display = desiredValue;
156-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
164+
^^^^^^^^^^^^^^^^^^^
157165
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts
166+
^
167+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts punctuation.accessor.ts
168+
^^^^^
169+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts
170+
^
171+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts punctuation.accessor.ts
172+
^^^^^^^^
173+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts
158174
^
159175
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts keyword.operator.assignment.ts
160176
^^^^^^^^^^^^^

‎tests/baselines/FunctionMethodParameters.baseline.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,12 @@ class testClass {
358358
source.ts meta.function.ts meta.block.ts
359359
^^^^^^
360360
source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
361-
^^^^^^^^^^
361+
^^^
362362
source.ts meta.function.ts meta.block.ts
363+
^
364+
source.ts meta.function.ts meta.block.ts punctuation.accessor.ts
365+
^^^^^^
366+
source.ts meta.function.ts meta.block.ts
363367
^
364368
source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
365369
>}
@@ -708,8 +712,12 @@ class testClass {
708712
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
709713
^^^^^^
710714
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts
711-
^^^^^^^^^^
715+
^^^
712716
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
717+
^
718+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
719+
^^^^^^
720+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
713721
^
714722
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
715723
> }

‎tests/baselines/Issue10.baseline.txt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,10 @@ class World {
9999
^^
100100
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
101101
> console.log("hello");
102-
^^^^^^^^^^^^^^^^
102+
^^^^^^^^^^^^^^^
103103
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
104+
^
105+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
104106
^^^
105107
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts
106108
^
@@ -132,8 +134,12 @@ class World {
132134
source.ts meta.class.ts
133135
^
134136
source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts
135-
^^^^^^^
137+
^^^^^
136138
source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts
139+
^
140+
source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts punctuation.accessor.ts
141+
^
142+
source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts
137143
^
138144
source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts
139145
^
@@ -168,8 +174,10 @@ class World {
168174
^^
169175
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
170176
> console.log("hello");
171-
^^^^^^^^^^^^^^^^
177+
^^^^^^^^^^^^^^^
172178
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
179+
^
180+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
173181
^^^
174182
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts
175183
^

‎tests/baselines/Issue110.baseline.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ let i = ^^1, j = ^^1e3
7575
^^^^^
7676
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
7777
^
78-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
78+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
7979
^
8080
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
8181
^
@@ -134,7 +134,7 @@ let i = ^^1, j = ^^1e3
134134
^^^^
135135
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
136136
^
137-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
137+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
138138
^
139139
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
140140
>let number7 = 14.6e+10
@@ -202,7 +202,7 @@ let i = ^^1, j = ^^1e3
202202
^^^^^
203203
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
204204
^
205-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
205+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
206206
^
207207
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
208208
>let number11 = 12E-10
@@ -240,7 +240,7 @@ let i = ^^1, j = ^^1e3
240240
^^^^^
241241
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
242242
^
243-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
243+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.accessor.ts
244244
^
245245
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
246246
>let number13 = 14.12

‎tests/baselines/Issue112.baseline.txt

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,12 @@ this._waitingConnections.delete(connection);
2323
source.ts new.expr.ts entity.name.type.ts
2424
^
2525
source.ts meta.brace.round.ts
26-
^^^^^^^^^^^^^
26+
^^^^^^^^
2727
source.ts
28+
^
29+
source.ts punctuation.accessor.ts
30+
^^^^
31+
source.ts
2832
^
2933
source.ts punctuation.separator.comma.ts
3034
^^^^^^^^^^^^^
@@ -40,8 +44,10 @@ this._waitingConnections.delete(connection);
4044
^^
4145
source.ts
4246
>angular.module('app')
43-
^^^^^^^^
47+
^^^^^^^
4448
source.ts
49+
^
50+
source.ts punctuation.accessor.ts
4551
^^^^^^
4652
source.ts entity.name.function.ts
4753
^
@@ -59,14 +65,22 @@ this._waitingConnections.delete(connection);
5965
>this._connections.delete(connection.id);
6066
^^^^
6167
source.ts variable.language.this.ts
62-
^^^^^^^^^^^^^^
63-
source.ts
68+
^
69+
source.ts punctuation.accessor.ts
70+
^^^^^^^^^^^^
71+
source.ts
72+
^
73+
source.ts punctuation.accessor.ts
6474
^^^^^^
6575
source.ts entity.name.function.ts
6676
^
6777
source.ts meta.brace.round.ts
68-
^^^^^^^^^^^^^
78+
^^^^^^^^^^
6979
source.ts
80+
^
81+
source.ts punctuation.accessor.ts
82+
^^
83+
source.ts
7084
^
7185
source.ts meta.brace.round.ts
7286
^
@@ -76,8 +90,12 @@ this._waitingConnections.delete(connection);
7690
>this._waitingConnections.delete(connection);
7791
^^^^
7892
source.ts variable.language.this.ts
79-
^^^^^^^^^^^^^^^^^^^^^
80-
source.ts
93+
^
94+
source.ts punctuation.accessor.ts
95+
^^^^^^^^^^^^^^^^^^^
96+
source.ts
97+
^
98+
source.ts punctuation.accessor.ts
8199
^^^^^^
82100
source.ts entity.name.function.ts
83101
^

0 commit comments

Comments
 (0)