Skip to content

Commit f2cdd8b

Browse files
sheetalkamatsheetalkamat
committed
Add scope 'meta.function-call' for function-method calls
Fixes #413
1 parent e0fb5e0 commit f2cdd8b

File tree

83 files changed

+774
-748
lines changed

Some content is hidden

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

83 files changed

+774
-748
lines changed

‎TypeScript.YAML-tmLanguage‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1367,12 +1367,16 @@ repository:
13671367
begin: (?=(([_$[:alpha:]][_$[:alnum:]]*\s*\.\s*)*|(\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\s*(<([^<>=]|=[^<]|\<([^=<>]|=[^<])+\>)+>\s*)?\()
13681368
end: (?<=\))(?!(([_$[:alpha:]][_$[:alnum:]]*\s*\.\s*)*|(\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\s*(<([^<>=]|=[^<]|\<([^=<>]|=[^<])+\>)+>\s*)?\()
13691369
patterns:
1370-
- include: '#literal'
1371-
- include: '#support-objects'
1372-
- include: '#object-identifiers'
1373-
- include: '#punctuation-accessor'
1374-
- name: entity.name.function.ts
1375-
match: ([_$[:alpha:]][_$[:alnum:]]*)
1370+
- name: meta.function-call.ts
1371+
begin: (?=(([_$[:alpha:]][_$[:alnum:]]*\s*\.\s*)*|(\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*))
1372+
end: (?=\s*(<([^<>=]|=[^<]|\<([^=<>]|=[^<])+\>)+>\s*)?\()
1373+
patterns:
1374+
- include: '#literal'
1375+
- include: '#support-objects'
1376+
- include: '#object-identifiers'
1377+
- include: '#punctuation-accessor'
1378+
- name: entity.name.function.ts
1379+
match: ([_$[:alpha:]][_$[:alnum:]]*)
13761380
- include: '#comment'
13771381
- name: meta.type.parameters.ts
13781382
begin: \<

‎TypeScript.tmLanguage‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3757,27 +3757,38 @@
37573757
<string>(?&lt;=\))(?!(([_$[:alpha:]][_$[:alnum:]]*\s*\.\s*)*|(\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\s*(&lt;([^&lt;&gt;=]|=[^&lt;]|\&lt;([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?\()</string>
37583758
<key>patterns</key>
37593759
<array>
3760-
<dict>
3761-
<key>include</key>
3762-
<string>#literal</string>
3763-
</dict>
3764-
<dict>
3765-
<key>include</key>
3766-
<string>#support-objects</string>
3767-
</dict>
3768-
<dict>
3769-
<key>include</key>
3770-
<string>#object-identifiers</string>
3771-
</dict>
3772-
<dict>
3773-
<key>include</key>
3774-
<string>#punctuation-accessor</string>
3775-
</dict>
37763760
<dict>
37773761
<key>name</key>
3778-
<string>entity.name.function.ts</string>
3779-
<key>match</key>
3780-
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
3762+
<string>meta.function-call.ts</string>
3763+
<key>begin</key>
3764+
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\.\s*)*|(\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*))</string>
3765+
<key>end</key>
3766+
<string>(?=\s*(&lt;([^&lt;&gt;=]|=[^&lt;]|\&lt;([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?\()</string>
3767+
<key>patterns</key>
3768+
<array>
3769+
<dict>
3770+
<key>include</key>
3771+
<string>#literal</string>
3772+
</dict>
3773+
<dict>
3774+
<key>include</key>
3775+
<string>#support-objects</string>
3776+
</dict>
3777+
<dict>
3778+
<key>include</key>
3779+
<string>#object-identifiers</string>
3780+
</dict>
3781+
<dict>
3782+
<key>include</key>
3783+
<string>#punctuation-accessor</string>
3784+
</dict>
3785+
<dict>
3786+
<key>name</key>
3787+
<string>entity.name.function.ts</string>
3788+
<key>match</key>
3789+
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
3790+
</dict>
3791+
</array>
37813792
</dict>
37823793
<dict>
37833794
<key>include</key>

‎TypeScriptReact.tmLanguage‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3761,27 +3761,38 @@
37613761
<string>(?&lt;=\))(?!(([_$[:alpha:]][_$[:alnum:]]*\s*\.\s*)*|(\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\s*(&lt;([^&lt;&gt;=]|=[^&lt;]|\&lt;([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?\()</string>
37623762
<key>patterns</key>
37633763
<array>
3764-
<dict>
3765-
<key>include</key>
3766-
<string>#literal</string>
3767-
</dict>
3768-
<dict>
3769-
<key>include</key>
3770-
<string>#support-objects</string>
3771-
</dict>
3772-
<dict>
3773-
<key>include</key>
3774-
<string>#object-identifiers</string>
3775-
</dict>
3776-
<dict>
3777-
<key>include</key>
3778-
<string>#punctuation-accessor</string>
3779-
</dict>
37803764
<dict>
37813765
<key>name</key>
3782-
<string>entity.name.function.tsx</string>
3783-
<key>match</key>
3784-
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
3766+
<string>meta.function-call.tsx</string>
3767+
<key>begin</key>
3768+
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\.\s*)*|(\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*))</string>
3769+
<key>end</key>
3770+
<string>(?=\s*(&lt;([^&lt;&gt;=]|=[^&lt;]|\&lt;([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?\()</string>
3771+
<key>patterns</key>
3772+
<array>
3773+
<dict>
3774+
<key>include</key>
3775+
<string>#literal</string>
3776+
</dict>
3777+
<dict>
3778+
<key>include</key>
3779+
<string>#support-objects</string>
3780+
</dict>
3781+
<dict>
3782+
<key>include</key>
3783+
<string>#object-identifiers</string>
3784+
</dict>
3785+
<dict>
3786+
<key>include</key>
3787+
<string>#punctuation-accessor</string>
3788+
</dict>
3789+
<dict>
3790+
<key>name</key>
3791+
<string>entity.name.function.tsx</string>
3792+
<key>match</key>
3793+
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
3794+
</dict>
3795+
</array>
37853796
</dict>
37863797
<dict>
37873798
<key>include</key>

‎tests/baselines/Abstracts.baseline.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,11 @@ Grammar: TypeScript.tmLanguage
261261
source.ts punctuation.terminator.statement.ts
262262
>cow.makeSound();
263263
^^^
264-
source.ts variable.other.object.ts
264+
source.ts meta.function-call.ts variable.other.object.ts
265265
^
266-
source.ts punctuation.accessor.ts
266+
source.ts meta.function-call.ts punctuation.accessor.ts
267267
^^^^^^^^^
268-
source.ts entity.name.function.ts
268+
source.ts meta.function-call.ts entity.name.function.ts
269269
^
270270
source.ts meta.brace.round.ts
271271
^

‎tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ Grammar: TypeScript.tmLanguage
379379
^
380380
source.ts meta.function.ts meta.block.ts meta.block.ts
381381
^
382-
source.ts meta.function.ts meta.block.ts meta.block.ts entity.name.function.ts
382+
source.ts meta.function.ts meta.block.ts meta.block.ts meta.function-call.ts entity.name.function.ts
383383
^
384384
source.ts meta.function.ts meta.block.ts meta.block.ts meta.brace.round.ts
385385
^

‎tests/baselines/Issue10.baseline.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ Grammar: TypeScript.tmLanguage
110110
^^^^^^^^
111111
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
112112
^^^^^^^
113-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.class.console.ts
113+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.function-call.ts support.class.console.ts
114114
^
115-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
115+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.function-call.ts punctuation.accessor.ts
116116
^^^
117-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.function.console.ts
117+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.function-call.ts support.function.console.ts
118118
^
119119
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
120120
^
@@ -187,11 +187,11 @@ Grammar: TypeScript.tmLanguage
187187
^^^^^^^^
188188
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
189189
^^^^^^^
190-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.class.console.ts
190+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.function-call.ts support.class.console.ts
191191
^
192-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
192+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.function-call.ts punctuation.accessor.ts
193193
^^^
194-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.function.console.ts
194+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.function-call.ts support.function.console.ts
195195
^
196196
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
197197
^

‎tests/baselines/Issue112.baseline.txt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ Grammar: TypeScript.tmLanguage
5151
source.ts
5252
>angular.module('app')
5353
^^^^^^^
54-
source.ts variable.other.object.ts
54+
source.ts meta.function-call.ts variable.other.object.ts
5555
^
56-
source.ts punctuation.accessor.ts
56+
source.ts meta.function-call.ts punctuation.accessor.ts
5757
^^^^^^
58-
source.ts entity.name.function.ts
58+
source.ts meta.function-call.ts entity.name.function.ts
5959
^
6060
source.ts meta.brace.round.ts
6161
^
@@ -70,15 +70,15 @@ Grammar: TypeScript.tmLanguage
7070
source.ts
7171
>this._connections.delete(connection.id);
7272
^^^^
73-
source.ts variable.language.this.ts
73+
source.ts meta.function-call.ts variable.language.this.ts
7474
^
75-
source.ts punctuation.accessor.ts
75+
source.ts meta.function-call.ts punctuation.accessor.ts
7676
^^^^^^^^^^^^
77-
source.ts variable.other.object.property.ts
77+
source.ts meta.function-call.ts variable.other.object.property.ts
7878
^
79-
source.ts punctuation.accessor.ts
79+
source.ts meta.function-call.ts punctuation.accessor.ts
8080
^^^^^^
81-
source.ts support.function.dom.ts
81+
source.ts meta.function-call.ts support.function.dom.ts
8282
^
8383
source.ts meta.brace.round.ts
8484
^^^^^^^^^^
@@ -95,15 +95,15 @@ Grammar: TypeScript.tmLanguage
9595
source.ts
9696
>this._waitingConnections.delete(connection);
9797
^^^^
98-
source.ts variable.language.this.ts
98+
source.ts meta.function-call.ts variable.language.this.ts
9999
^
100-
source.ts punctuation.accessor.ts
100+
source.ts meta.function-call.ts punctuation.accessor.ts
101101
^^^^^^^^^^^^^^^^^^^
102-
source.ts variable.other.object.property.ts
102+
source.ts meta.function-call.ts variable.other.object.property.ts
103103
^
104-
source.ts punctuation.accessor.ts
104+
source.ts meta.function-call.ts punctuation.accessor.ts
105105
^^^^^^
106-
source.ts support.function.dom.ts
106+
source.ts meta.function-call.ts support.function.dom.ts
107107
^
108108
source.ts meta.brace.round.ts
109109
^^^^^^^^^^

‎tests/baselines/Issue139.baseline.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ Grammar: TypeScript.tmLanguage
4040
^^^^
4141
source.ts new.expr.ts meta.function.expression.ts meta.block.ts
4242
^^^^^^^
43-
source.ts new.expr.ts meta.function.expression.ts meta.block.ts support.class.console.ts
43+
source.ts new.expr.ts meta.function.expression.ts meta.block.ts meta.function-call.ts support.class.console.ts
4444
^
45-
source.ts new.expr.ts meta.function.expression.ts meta.block.ts punctuation.accessor.ts
45+
source.ts new.expr.ts meta.function.expression.ts meta.block.ts meta.function-call.ts punctuation.accessor.ts
4646
^^^
47-
source.ts new.expr.ts meta.function.expression.ts meta.block.ts support.function.console.ts
47+
source.ts new.expr.ts meta.function.expression.ts meta.block.ts meta.function-call.ts support.function.console.ts
4848
^
4949
source.ts new.expr.ts meta.function.expression.ts meta.block.ts meta.brace.round.ts
5050
^^^^

‎tests/baselines/Issue142.baseline.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,23 @@ Grammar: TypeScript.tmLanguage
4747
^^^^
4848
source.ts meta.class.ts meta.field.declaration.ts meta.arrow.ts
4949
^^^^
50-
source.ts meta.class.ts meta.field.declaration.ts variable.language.this.ts
50+
source.ts meta.class.ts meta.field.declaration.ts meta.function-call.ts variable.language.this.ts
5151
^
52-
source.ts meta.class.ts meta.field.declaration.ts punctuation.accessor.ts
52+
source.ts meta.class.ts meta.field.declaration.ts meta.function-call.ts punctuation.accessor.ts
5353
^^^^
54-
source.ts meta.class.ts meta.field.declaration.ts entity.name.function.ts
54+
source.ts meta.class.ts meta.field.declaration.ts meta.function-call.ts entity.name.function.ts
5555
^
5656
source.ts meta.class.ts meta.field.declaration.ts meta.brace.round.ts
5757
^^^^
58-
source.ts meta.class.ts meta.field.declaration.ts variable.language.this.ts
58+
source.ts meta.class.ts meta.field.declaration.ts meta.function-call.ts variable.language.this.ts
5959
^
60-
source.ts meta.class.ts meta.field.declaration.ts punctuation.accessor.ts
60+
source.ts meta.class.ts meta.field.declaration.ts meta.function-call.ts punctuation.accessor.ts
6161
^^^
62-
source.ts meta.class.ts meta.field.declaration.ts variable.other.object.property.ts
62+
source.ts meta.class.ts meta.field.declaration.ts meta.function-call.ts variable.other.object.property.ts
6363
^
64-
source.ts meta.class.ts meta.field.declaration.ts punctuation.accessor.ts
64+
source.ts meta.class.ts meta.field.declaration.ts meta.function-call.ts punctuation.accessor.ts
6565
^^^^^^
66-
source.ts meta.class.ts meta.field.declaration.ts support.function.ts
66+
source.ts meta.class.ts meta.field.declaration.ts meta.function-call.ts support.function.ts
6767
^
6868
source.ts meta.class.ts meta.field.declaration.ts meta.brace.round.ts
6969
^

‎tests/baselines/Issue143.baseline.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Grammar: TypeScript.tmLanguage
6767
^
6868
source.ts meta.decorator.ts punctuation.decorator.ts
6969
^^^^^^^^^
70-
source.ts meta.decorator.ts entity.name.function.ts
70+
source.ts meta.decorator.ts meta.function-call.ts entity.name.function.ts
7171
^
7272
source.ts meta.decorator.ts meta.brace.round.ts
7373
^
@@ -126,7 +126,7 @@ Grammar: TypeScript.tmLanguage
126126
^
127127
source.ts meta.class.ts meta.decorator.ts punctuation.decorator.ts
128128
^^^^^^^^^^^^
129-
source.ts meta.class.ts meta.decorator.ts entity.name.function.ts
129+
source.ts meta.class.ts meta.decorator.ts meta.function-call.ts entity.name.function.ts
130130
^
131131
source.ts meta.class.ts meta.decorator.ts meta.brace.round.ts
132132
^
@@ -171,11 +171,11 @@ Grammar: TypeScript.tmLanguage
171171
^^^^
172172
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
173173
^^^^^^^
174-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.class.console.ts
174+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.function-call.ts support.class.console.ts
175175
^
176-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
176+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.function-call.ts punctuation.accessor.ts
177177
^^^
178-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.function.console.ts
178+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.function-call.ts support.function.console.ts
179179
^
180180
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
181181
^
@@ -234,7 +234,7 @@ Grammar: TypeScript.tmLanguage
234234
^
235235
source.ts meta.decorator.ts punctuation.decorator.ts
236236
^^^^^^^^^
237-
source.ts meta.decorator.ts entity.name.function.ts
237+
source.ts meta.decorator.ts meta.function-call.ts entity.name.function.ts
238238
^
239239
source.ts meta.decorator.ts meta.brace.round.ts
240240
^
@@ -336,11 +336,11 @@ Grammar: TypeScript.tmLanguage
336336
^
337337
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
338338
^^^^^^^
339-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.class.console.ts
339+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.function-call.ts support.class.console.ts
340340
^
341-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
341+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.function-call.ts punctuation.accessor.ts
342342
^^^^^
343-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.function.console.ts
343+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.function-call.ts support.function.console.ts
344344
^
345345
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
346346
^

0 commit comments

Comments
 (0)