Skip to content

Commit 4567ceb

Browse files
sheetalkamatsheetalkamat
committed
Few updates
1 parent 56e921e commit 4567ceb

File tree

3 files changed

+110
-96
lines changed

3 files changed

+110
-96
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,6 +1399,8 @@ repository:
13991399
match: \*=|(?<!\()/=|%=|\+=|\-=
14001400
- name: keyword.operator.assignment.compound.bitwise.ts
14011401
match: \&=|\^=|<<=|>>=|>>>=|\|=
1402+
- name: keyword.operator.bitwise.shift.ts
1403+
match: <<|>>>|>>
14021404
- name: keyword.operator.comparison.ts
14031405
match: ===|!==|==|!=
14041406
- name: keyword.operator.relational.ts
@@ -1746,27 +1748,25 @@ repository:
17461748
match: (?<!\w)@(abstract|access|alias|arg|argument|async|attribute|augments|author|beta|borrows|bubbes|callback|chainable|class|classdesc|code|config|const|constant|constructor|constructs|copyright|default|defaultvalue|define|deprecated|desc|description|dict|emits|enum|event|example|exports?|extends|extension|extension_for|extensionfor|external|file|fileoverview|final|fires|for|function|global|host|ignore|implements|inherit[Dd]oc|inner|instance|interface|kind|lends|license|listens|main|member|memberof|method|mixex|mixins?|module|name|namespace|nocollapse|nosideeffects|override|overview|package|param|preserve|private|prop|property|protected|public|read[Oo]nly|record|require[ds]|returns?|see|since|static|struct|submodule|summary|template|this|throws|todo|tutorial|type|typedef|unrestricted|uses|var|variation|version|virtual|writeOnce)\b
17471749
- match: |-
17481750
(?x)
1749-
(?:(?<=@param)|(?<=@type))
1751+
(?:(?<=@param)|(?<=@arg)|(?<=@argument)|(?<=@type))
17501752
\s+
17511753
({(?:
17521754
\* | # {*} any type
17531755
\? | # {?} unknown type
1754-
1755-
(?: # Check for a prefix
1756+
(?: # Check for a prefix
17561757
\? | # {?string} nullable type
1757-
! | # {!string} non-nullable type
1758+
! | # {!string} non-nullable type
17581759
\.{3} # {...string} variable number of parameters
17591760
)?
1760-
17611761
(?:
17621762
\( # Opening bracket of multiple types with parenthesis {(string|number)}
17631763
[a-zA-Z_$]+
17641764
(?:
17651765
(?:
17661766
[\w$]*
1767-
(?:\[\])? # {(string[]|number)} type application, an array of strings or a number
1767+
(?:\[\])? # {(string[]|number)} type application, an array of strings or a number
17681768
) |
1769-
<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application
1769+
\.?<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application (optional .)
17701770
)
17711771
(?:
17721772
[\.|~] # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback
@@ -1776,7 +1776,7 @@ repository:
17761776
[\w$]*
17771777
(?:\[\])? # {(string|number[])} type application, a string or an array of numbers
17781778
) |
1779-
<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application
1779+
\.?<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application (optional .)
17801780
)
17811781
)*
17821782
\) |
@@ -1786,35 +1786,35 @@ repository:
17861786
[\w$]*
17871787
(?:\[\])? # {string[]|number} type application, an array of strings or a number
17881788
) |
1789-
<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application
1789+
\.?<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application (optional .)
17901790
)
17911791
(?:
1792-
[\.|~] # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback
1792+
[\.|~] # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback
17931793
[a-zA-Z_$]+
17941794
(?:
17951795
[\w$]* |
1796-
<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application
1796+
\.?<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application (optional .)
17971797
)
17981798
)*
17991799
)
1800-
# Check for suffix
1800+
# Check for suffix
18011801
(?:\[\])? # {string[]} type application, an array of strings
1802-
=? # {string=} optional parameter
1802+
=? # {string=} optional parameter
18031803
)})
18041804
\s+
18051805
(
1806-
\[ # [foo] optional parameter
1806+
\[ # [foo] optional parameter
18071807
\s*
18081808
(?:
18091809
[a-zA-Z_$][\w$]*
18101810
(?:
18111811
(?:\[\])? # Foo[].bar properties within an array
1812-
\. # Foo.Bar namespaced parameter
1812+
\. # Foo.Bar namespaced parameter
18131813
[a-zA-Z_$][\w$]*
18141814
)*
18151815
(?:
18161816
\s*
1817-
= # [foo=bar] Default parameter value
1817+
= # [foo=bar] Default parameter value
18181818
\s*
18191819
[\w$\s]*
18201820
)?
@@ -1825,12 +1825,13 @@ repository:
18251825
[a-zA-Z_$][\w$]*
18261826
(?:
18271827
(?:\[\])? # Foo[].bar properties within an array
1828-
\. # Foo.Bar namespaced parameter
1828+
\. # Foo.Bar namespaced parameter
18291829
[a-zA-Z_$][\w$]*
18301830
)*
18311831
)?
18321832
)
18331833
\s+
1834+
(?:-\s+)? # optional hyphen before the description
18341835
((?:(?!\*\/).)*) # The type description
18351836
captures:
18361837
'0': { name: other.meta.jsdoc }
@@ -1840,50 +1841,51 @@ repository:
18401841
- match: |-
18411842
(?x)
18421843
({(?:
1843-
\* | # {*} any type
1844-
\? | # {?} unknown type
1844+
\* | # {*} any type
1845+
\? | # {?} unknown type
18451846
1846-
(?: # Check for a prefix
1847-
\? | # {?string} nullable type
1848-
! | # {!string} non-nullable type
1849-
\.{3} # {...string} variable number of parameters
1847+
(?: # Check for a prefix
1848+
\? | # {?string} nullable type
1849+
! | # {!string} non-nullable type
1850+
\.{3} # {...string} variable number of parameters
18501851
)?
18511852
18521853
(?:
1853-
\( # Opening bracket of multiple types with parenthesis {(string|number)}
1854+
\( # Opening bracket of multiple types with parenthesis {(string|number)}
18541855
[a-zA-Z_$]+
18551856
(?:
18561857
[\w$]* |
1857-
<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application
1858+
\.?<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application (optional .)
18581859
)
18591860
(?:
1860-
[\.|~] # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback
1861+
[\.|~] # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback
18611862
[a-zA-Z_$]+
18621863
(?:
18631864
[\w$]* |
1864-
<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application
1865+
\.?<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application (optional .)
18651866
)
18661867
)*
18671868
\) |
18681869
[a-zA-Z_$]+
18691870
(?:
18701871
[\w$]* |
1871-
<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application
1872+
\.?<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application (optional .)
18721873
)
18731874
(?:
1874-
[\.|~] # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback
1875+
[\.|~] # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback
18751876
[a-zA-Z_$]+
18761877
(?:
18771878
[\w$]* |
1878-
<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application
1879+
\.?<[\w$]+(?:,\s+[\w$]+)*> # {Array<string>} or {Object<string, number>} type application (optional .)
18791880
)
18801881
)*
18811882
)
1882-
# Check for suffix
1883+
# Check for suffix
18831884
(?:\[\])? # {string[]} type application, an array of strings
1884-
=? # {string=} optional parameter
1885+
=? # {string=} optional parameter
18851886
)})
18861887
\s+
1888+
(?:-\s+)? # optional hyphen before the description
18871889
((?:(?!\*\/).)*) # The type description
18881890
captures:
18891891
'0': { name: other.meta.jsdoc }

‎TypeScript.tmLanguage

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3940,6 +3940,12 @@
39403940
<key>match</key>
39413941
<string>\&amp;=|\^=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|\|=</string>
39423942
</dict>
3943+
<dict>
3944+
<key>name</key>
3945+
<string>keyword.operator.bitwise.shift.ts</string>
3946+
<key>match</key>
3947+
<string>&lt;&lt;|&gt;&gt;&gt;|&gt;&gt;</string>
3948+
</dict>
39433949
<dict>
39443950
<key>name</key>
39453951
<string>keyword.operator.comparison.ts</string>
@@ -4929,27 +4935,25 @@
49294935
<dict>
49304936
<key>match</key>
49314937
<string>(?x)
4932-
(?:(?&lt;=@param)|(?&lt;=@type))
4938+
(?:(?&lt;=@param)|(?&lt;=@arg)|(?&lt;=@argument)|(?&lt;=@type))
49334939
\s+
49344940
({(?:
49354941
\* | # {*} any type
49364942
\? | # {?} unknown type
4937-
4938-
(?: # Check for a prefix
4943+
(?: # Check for a prefix
49394944
\? | # {?string} nullable type
4940-
! | # {!string} non-nullable type
4945+
! | # {!string} non-nullable type
49414946
\.{3} # {...string} variable number of parameters
49424947
)?
4943-
49444948
(?:
49454949
\( # Opening bracket of multiple types with parenthesis {(string|number)}
49464950
[a-zA-Z_$]+
49474951
(?:
49484952
(?:
49494953
[\w$]*
4950-
(?:\[\])? # {(string[]|number)} type application, an array of strings or a number
4954+
(?:\[\])? # {(string[]|number)} type application, an array of strings or a number
49514955
) |
4952-
&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application
4956+
\.?&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application (optional .)
49534957
)
49544958
(?:
49554959
[\.|~] # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback
@@ -4959,7 +4963,7 @@
49594963
[\w$]*
49604964
(?:\[\])? # {(string|number[])} type application, a string or an array of numbers
49614965
) |
4962-
&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application
4966+
\.?&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application (optional .)
49634967
)
49644968
)*
49654969
\) |
@@ -4969,35 +4973,35 @@
49694973
[\w$]*
49704974
(?:\[\])? # {string[]|number} type application, an array of strings or a number
49714975
) |
4972-
&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application
4976+
\.?&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application (optional .)
49734977
)
49744978
(?:
4975-
[\.|~] # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback
4979+
[\.|~] # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback
49764980
[a-zA-Z_$]+
49774981
(?:
49784982
[\w$]* |
4979-
&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application
4983+
\.?&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application (optional .)
49804984
)
49814985
)*
49824986
)
4983-
# Check for suffix
4987+
# Check for suffix
49844988
(?:\[\])? # {string[]} type application, an array of strings
4985-
=? # {string=} optional parameter
4989+
=? # {string=} optional parameter
49864990
)})
49874991
\s+
49884992
(
4989-
\[ # [foo] optional parameter
4993+
\[ # [foo] optional parameter
49904994
\s*
49914995
(?:
49924996
[a-zA-Z_$][\w$]*
49934997
(?:
49944998
(?:\[\])? # Foo[].bar properties within an array
4995-
\. # Foo.Bar namespaced parameter
4999+
\. # Foo.Bar namespaced parameter
49965000
[a-zA-Z_$][\w$]*
49975001
)*
49985002
(?:
49995003
\s*
5000-
= # [foo=bar] Default parameter value
5004+
= # [foo=bar] Default parameter value
50015005
\s*
50025006
[\w$\s]*
50035007
)?
@@ -5008,12 +5012,13 @@
50085012
[a-zA-Z_$][\w$]*
50095013
(?:
50105014
(?:\[\])? # Foo[].bar properties within an array
5011-
\. # Foo.Bar namespaced parameter
5015+
\. # Foo.Bar namespaced parameter
50125016
[a-zA-Z_$][\w$]*
50135017
)*
50145018
)?
50155019
)
50165020
\s+
5021+
(?:-\s+)? # optional hyphen before the description
50175022
((?:(?!\*\/).)*) # The type description</string>
50185023
<key>captures</key>
50195024
<dict>
@@ -5043,50 +5048,51 @@
50435048
<key>match</key>
50445049
<string>(?x)
50455050
({(?:
5046-
\* | # {*} any type
5047-
\? | # {?} unknown type
5051+
\* | # {*} any type
5052+
\? | # {?} unknown type
50485053
5049-
(?: # Check for a prefix
5050-
\? | # {?string} nullable type
5051-
! | # {!string} non-nullable type
5052-
\.{3} # {...string} variable number of parameters
5054+
(?: # Check for a prefix
5055+
\? | # {?string} nullable type
5056+
! | # {!string} non-nullable type
5057+
\.{3} # {...string} variable number of parameters
50535058
)?
50545059
50555060
(?:
5056-
\( # Opening bracket of multiple types with parenthesis {(string|number)}
5061+
\( # Opening bracket of multiple types with parenthesis {(string|number)}
50575062
[a-zA-Z_$]+
50585063
(?:
50595064
[\w$]* |
5060-
&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application
5065+
\.?&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application (optional .)
50615066
)
50625067
(?:
5063-
[\.|~] # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback
5068+
[\.|~] # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback
50645069
[a-zA-Z_$]+
50655070
(?:
50665071
[\w$]* |
5067-
&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application
5072+
\.?&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application (optional .)
50685073
)
50695074
)*
50705075
\) |
50715076
[a-zA-Z_$]+
50725077
(?:
50735078
[\w$]* |
5074-
&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application
5079+
\.?&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application (optional .)
50755080
)
50765081
(?:
5077-
[\.|~] # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback
5082+
[\.|~] # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback
50785083
[a-zA-Z_$]+
50795084
(?:
50805085
[\w$]* |
5081-
&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application
5086+
\.?&lt;[\w$]+(?:,\s+[\w$]+)*&gt; # {Array&lt;string&gt;} or {Object&lt;string, number&gt;} type application (optional .)
50825087
)
50835088
)*
50845089
)
5085-
# Check for suffix
5090+
# Check for suffix
50865091
(?:\[\])? # {string[]} type application, an array of strings
5087-
=? # {string=} optional parameter
5092+
=? # {string=} optional parameter
50885093
)})
50895094
\s+
5095+
(?:-\s+)? # optional hyphen before the description
50905096
((?:(?!\*\/).)*) # The type description</string>
50915097
<key>captures</key>
50925098
<dict>

0 commit comments

Comments
 (0)