Skip to content

Commit d128c36

Browse files
sheetalkamatsheetalkamat
committed
Scope the complete function call instead of just method/function call to make sure they dont get confused with arrows
Fixes #397
1 parent 603284f commit d128c36

File tree

5 files changed

+190
-99
lines changed

5 files changed

+190
-99
lines changed

‎TypeScript.YAML-tmLanguage‎

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,11 +1363,12 @@ repository:
13631363
'4': { name: support.function.dom.ts }
13641364
13651365
function-call:
1366-
begin: (?=(\.\s*)?([_$[:alpha:]][_$[:alnum:]]*)\s*(<([^<>]|\<[^<>]+\>)+>\s*)?\()
1367-
end: (?<=\))(?!(\.\s*)?([_$[:alpha:]][_$[:alnum:]]*)\s*(<([^<>]|\<[^<>]+\>)+>\s*)?\()
1366+
begin: (?=(([_$[:alpha:]][_$[:alnum:]]*\s*\.\s*)*|(\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\s*(<([^<>]|\<[^<>]+\>)+>\s*)?\()
1367+
end: (?<=\))(?!(([_$[:alpha:]][_$[:alnum:]]*\s*\.\s*)*|(\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\s*(<([^<>]|\<[^<>]+\>)+>\s*)?\()
13681368
patterns:
13691369
- include: '#literal'
13701370
- include: '#support-objects'
1371+
- include: '#object-identifiers'
13711372
- include: '#punctuation-accessor'
13721373
- name: entity.name.function.ts
13731374
match: ([_$[:alpha:]][_$[:alnum:]]*)
@@ -1386,19 +1387,7 @@ repository:
13861387

13871388
identifiers:
13881389
patterns:
1389-
# class
1390-
- name: support.class.ts
1391-
match: ([_$[:alpha:]][_$[:alnum:]]*)(?=\s*\.\s*prototype\b(?!\$))
1392-
# object properties
1393-
- match: |-
1394-
(?x)(\.)\s*(?:
1395-
([[:upper:]][_$[:digit:][:upper:]]*) |
1396-
([_$[:alpha:]][_$[:alnum:]]*)
1397-
)(?=\s*\.\s*[_$[:alpha:]][_$[:alnum:]]*)
1398-
captures:
1399-
'1': { name: punctuation.accessor.ts }
1400-
'2': { name: variable.other.constant.object.property.ts }
1401-
'3': { name: variable.other.object.property.ts }
1390+
- include: '#object-identifiers'
14021391
# function and method assignment
14031392
- match: |-
14041393
(?x)(?:(\.)\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\s*=\s*(
@@ -1420,6 +1409,28 @@ repository:
14201409
captures:
14211410
'1': { name: punctuation.accessor.ts }
14221411
'2': { name: variable.other.property.ts }
1412+
# const
1413+
- name: variable.other.constant.ts
1414+
match: ([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])
1415+
# vars
1416+
- name: variable.other.readwrite.ts
1417+
match: '[_$[:alpha:]][_$[:alnum:]]*'
1418+
1419+
object-identifiers:
1420+
patterns:
1421+
# class
1422+
- name: support.class.ts
1423+
match: ([_$[:alpha:]][_$[:alnum:]]*)(?=\s*\.\s*prototype\b(?!\$))
1424+
# object properties
1425+
- match: |-
1426+
(?x)(\.)\s*(?:
1427+
([[:upper:]][_$[:digit:][:upper:]]*) |
1428+
([_$[:alpha:]][_$[:alnum:]]*)
1429+
)(?=\s*\.\s*[_$[:alpha:]][_$[:alnum:]]*)
1430+
captures:
1431+
'1': { name: punctuation.accessor.ts }
1432+
'2': { name: variable.other.constant.object.property.ts }
1433+
'3': { name: variable.other.object.property.ts }
14231434
# objects
14241435
- match: |-
14251436
(?x)(?:
@@ -1429,12 +1440,6 @@ repository:
14291440
captures:
14301441
'1': { name: variable.other.constant.object.ts }
14311442
'2': { name: variable.other.object.ts }
1432-
# const
1433-
- name: variable.other.constant.ts
1434-
match: ([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])
1435-
# vars
1436-
- name: variable.other.readwrite.ts
1437-
match: '[_$[:alpha:]][_$[:alnum:]]*'
14381443
14391444
cast:
14401445
name: cast.expr.ts

‎TypeScript.tmLanguage‎

Lines changed: 53 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3757,9 +3757,9 @@
37573757
<key>function-call</key>
37583758
<dict>
37593759
<key>begin</key>
3760-
<string>(?=(\.\s*)?([_$[:alpha:]][_$[:alnum:]]*)\s*(&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\()</string>
3760+
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\.\s*)*|(\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\s*(&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\()</string>
37613761
<key>end</key>
3762-
<string>(?&lt;=\))(?!(\.\s*)?([_$[:alpha:]][_$[:alnum:]]*)\s*(&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\()</string>
3762+
<string>(?&lt;=\))(?!(([_$[:alpha:]][_$[:alnum:]]*\s*\.\s*)*|(\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\s*(&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\()</string>
37633763
<key>patterns</key>
37643764
<array>
37653765
<dict>
@@ -3770,6 +3770,10 @@
37703770
<key>include</key>
37713771
<string>#support-objects</string>
37723772
</dict>
3773+
<dict>
3774+
<key>include</key>
3775+
<string>#object-identifiers</string>
3776+
</dict>
37733777
<dict>
37743778
<key>include</key>
37753779
<string>#punctuation-accessor</string>
@@ -3830,17 +3834,17 @@
38303834
<key>patterns</key>
38313835
<array>
38323836
<dict>
3833-
<key>name</key>
3834-
<string>support.class.ts</string>
3835-
<key>match</key>
3836-
<string>([_$[:alpha:]][_$[:alnum:]]*)(?=\s*\.\s*prototype\b(?!\$))</string>
3837+
<key>include</key>
3838+
<string>#object-identifiers</string>
38373839
</dict>
38383840
<dict>
38393841
<key>match</key>
3840-
<string>(?x)(\.)\s*(?:
3841-
([[:upper:]][_$[:digit:][:upper:]]*) |
3842-
([_$[:alpha:]][_$[:alnum:]]*)
3843-
)(?=\s*\.\s*[_$[:alpha:]][_$[:alnum:]]*)</string>
3842+
<string>(?x)(?:(\.)\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\s*=\s*(
3843+
(async\s+)|(function\s*[(&lt;])|(function\s+)|
3844+
([_$[:alpha:]][_$[:alnum:]]*\s*=&gt;)|
3845+
([(]\s*(([)]\s*:)|([_$[:alpha:]][_$[:alnum:]]*\s*:)|(\.\.\.) )) |
3846+
([&lt;]\s*[_$[:alpha:]][_$[:alnum:]]*((\s+extends\s*[^=&gt;])|(\s*[,]))) |
3847+
((&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\(([^()]|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=&gt;)))</string>
38443848
<key>captures</key>
38453849
<dict>
38463850
<key>1</key>
@@ -3851,23 +3855,13 @@
38513855
<key>2</key>
38523856
<dict>
38533857
<key>name</key>
3854-
<string>variable.other.constant.object.property.ts</string>
3855-
</dict>
3856-
<key>3</key>
3857-
<dict>
3858-
<key>name</key>
3859-
<string>variable.other.object.property.ts</string>
3858+
<string>entity.name.function.ts</string>
38603859
</dict>
38613860
</dict>
38623861
</dict>
38633862
<dict>
38643863
<key>match</key>
3865-
<string>(?x)(?:(\.)\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\s*=\s*(
3866-
(async\s+)|(function\s*[(&lt;])|(function\s+)|
3867-
([_$[:alpha:]][_$[:alnum:]]*\s*=&gt;)|
3868-
([(]\s*(([)]\s*:)|([_$[:alpha:]][_$[:alnum:]]*\s*:)|(\.\.\.) )) |
3869-
([&lt;]\s*[_$[:alpha:]][_$[:alnum:]]*((\s+extends\s*[^=&gt;])|(\s*[,]))) |
3870-
((&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\(([^()]|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=&gt;)))</string>
3864+
<string>(\.)\s*([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])</string>
38713865
<key>captures</key>
38723866
<dict>
38733867
<key>1</key>
@@ -3878,13 +3872,13 @@
38783872
<key>2</key>
38793873
<dict>
38803874
<key>name</key>
3881-
<string>entity.name.function.ts</string>
3875+
<string>variable.other.constant.property.ts</string>
38823876
</dict>
38833877
</dict>
38843878
</dict>
38853879
<dict>
38863880
<key>match</key>
3887-
<string>(\.)\s*([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])</string>
3881+
<string>(\.)\s*([_$[:alpha:]][_$[:alnum:]]*)</string>
38883882
<key>captures</key>
38893883
<dict>
38903884
<key>1</key>
@@ -3895,13 +3889,40 @@
38953889
<key>2</key>
38963890
<dict>
38973891
<key>name</key>
3898-
<string>variable.other.constant.property.ts</string>
3892+
<string>variable.other.property.ts</string>
38993893
</dict>
39003894
</dict>
39013895
</dict>
39023896
<dict>
3897+
<key>name</key>
3898+
<string>variable.other.constant.ts</string>
39033899
<key>match</key>
3904-
<string>(\.)\s*([_$[:alpha:]][_$[:alnum:]]*)</string>
3900+
<string>([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])</string>
3901+
</dict>
3902+
<dict>
3903+
<key>name</key>
3904+
<string>variable.other.readwrite.ts</string>
3905+
<key>match</key>
3906+
<string>[_$[:alpha:]][_$[:alnum:]]*</string>
3907+
</dict>
3908+
</array>
3909+
</dict>
3910+
<key>object-identifiers</key>
3911+
<dict>
3912+
<key>patterns</key>
3913+
<array>
3914+
<dict>
3915+
<key>name</key>
3916+
<string>support.class.ts</string>
3917+
<key>match</key>
3918+
<string>([_$[:alpha:]][_$[:alnum:]]*)(?=\s*\.\s*prototype\b(?!\$))</string>
3919+
</dict>
3920+
<dict>
3921+
<key>match</key>
3922+
<string>(?x)(\.)\s*(?:
3923+
([[:upper:]][_$[:digit:][:upper:]]*) |
3924+
([_$[:alpha:]][_$[:alnum:]]*)
3925+
)(?=\s*\.\s*[_$[:alpha:]][_$[:alnum:]]*)</string>
39053926
<key>captures</key>
39063927
<dict>
39073928
<key>1</key>
@@ -3912,7 +3933,12 @@
39123933
<key>2</key>
39133934
<dict>
39143935
<key>name</key>
3915-
<string>variable.other.property.ts</string>
3936+
<string>variable.other.constant.object.property.ts</string>
3937+
</dict>
3938+
<key>3</key>
3939+
<dict>
3940+
<key>name</key>
3941+
<string>variable.other.object.property.ts</string>
39163942
</dict>
39173943
</dict>
39183944
</dict>
@@ -3936,18 +3962,6 @@
39363962
</dict>
39373963
</dict>
39383964
</dict>
3939-
<dict>
3940-
<key>name</key>
3941-
<string>variable.other.constant.ts</string>
3942-
<key>match</key>
3943-
<string>([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])</string>
3944-
</dict>
3945-
<dict>
3946-
<key>name</key>
3947-
<string>variable.other.readwrite.ts</string>
3948-
<key>match</key>
3949-
<string>[_$[:alpha:]][_$[:alnum:]]*</string>
3950-
</dict>
39513965
</array>
39523966
</dict>
39533967
<key>cast</key>

0 commit comments

Comments
 (0)