Skip to content

Commit f84ed01

Browse files
Update tmLanguage files.
1 parent 4f4f87d commit f84ed01

File tree

2 files changed

+26
-18
lines changed

2 files changed

+26
-18
lines changed

TypeScript.tmLanguage

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2050,7 +2050,7 @@
20502050
</dict>
20512051
</dict>
20522052
<key>end</key>
2053-
<string>(?=$|^|;)|(?&lt;=\})</string>
2053+
<string>(?=;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|(?&lt;=\})</string>
20542054
<key>patterns</key>
20552055
<array>
20562056
<dict>
@@ -2510,6 +2510,10 @@
25102510
<key>include</key>
25112511
<string>#arrow-return-type</string>
25122512
</dict>
2513+
<dict>
2514+
<key>include</key>
2515+
<string>#possibly-arrow-return-type</string>
2516+
</dict>
25132517
</array>
25142518
</dict>
25152519
<dict>
@@ -2526,9 +2530,13 @@
25262530
</dict>
25272531
</dict>
25282532
<key>end</key>
2529-
<string>(?&lt;=\}|\S)(?&lt;!=&gt;)|((?!\{)(?=\S))</string>
2533+
<string>((?&lt;=\}|\S)(?&lt;!=&gt;)|((?!\{)(?=\S)))(?!\/[\/\*])</string>
25302534
<key>patterns</key>
25312535
<array>
2536+
<dict>
2537+
<key>include</key>
2538+
<string>#single-line-comment-consuming-line-ending</string>
2539+
</dict>
25322540
<dict>
25332541
<key>include</key>
25342542
<string>#decl-block</string>
@@ -4472,7 +4480,7 @@
44724480
</dict>
44734481
</dict>
44744482
<key>end</key>
4475-
<string>(?&lt;=\))|(?=[;),}\]:]|\|\||\&amp;\&amp;|$|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))new(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))</string>
4483+
<string>(?&lt;=\))|(?=[;),}\]:\-\+]|\|\||\&amp;\&amp;|$|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))new(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))</string>
44764484
<key>patterns</key>
44774485
<array>
44784486
<dict>
@@ -4538,7 +4546,7 @@
45384546
</dict>
45394547
<dict>
45404548
<key>begin</key>
4541-
<string>(?&lt;=[(=,]|=&gt;)\s*(async)?(?=\s*((((&lt;\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=&lt;&gt;]|=[^&lt;]|\&lt;\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=&lt;&gt;]|=[^&lt;])*\&gt;)*&gt;\s*))?\()|(&lt;))\s*$)</string>
4549+
<string>(?&lt;=[(=,]|=&gt;|^return|[^\._$[:alnum:]]return)\s*(async)?(?=\s*((((&lt;\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=&lt;&gt;]|=[^&lt;]|\&lt;\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=&lt;&gt;]|=[^&lt;])*\&gt;)*&gt;\s*))?\()|(&lt;))\s*$)</string>
45424550
<key>beginCaptures</key>
45434551
<dict>
45444552
<key>1</key>
@@ -6033,7 +6041,7 @@
60336041
<key>possibly-arrow-return-type</key>
60346042
<dict>
60356043
<key>begin</key>
6036-
<string>(?&lt;=\))\s*(:)(?=\s*([^&lt;&gt;\(\)\{\}]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\)|\{[^\{\}]+\})+\s*=&gt;)</string>
6044+
<string>(?&lt;=\)|^)\s*(:)(?=\s*([^&lt;&gt;\(\)\{\}]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\)|\{[^\{\}]+\})+\s*=&gt;)</string>
60376045
<key>beginCaptures</key>
60386046
<dict>
60396047
<key>1</key>
@@ -6448,10 +6456,6 @@
64486456
</dict>
64496457
<key>patterns</key>
64506458
<array>
6451-
<dict>
6452-
<key>include</key>
6453-
<string>#destructuring-parameter</string>
6454-
</dict>
64556459
<dict>
64566460
<key>match</key>
64576461
<string>(?x)(?:(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?&lt;!=|:)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\s*(\??)(?=\s*(:\s*(

TypeScriptReact.tmLanguage

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2054,7 +2054,7 @@
20542054
</dict>
20552055
</dict>
20562056
<key>end</key>
2057-
<string>(?=$|^|;)|(?&lt;=\})</string>
2057+
<string>(?=;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|(?&lt;=\})</string>
20582058
<key>patterns</key>
20592059
<array>
20602060
<dict>
@@ -2514,6 +2514,10 @@
25142514
<key>include</key>
25152515
<string>#arrow-return-type</string>
25162516
</dict>
2517+
<dict>
2518+
<key>include</key>
2519+
<string>#possibly-arrow-return-type</string>
2520+
</dict>
25172521
</array>
25182522
</dict>
25192523
<dict>
@@ -2530,9 +2534,13 @@
25302534
</dict>
25312535
</dict>
25322536
<key>end</key>
2533-
<string>(?&lt;=\}|\S)(?&lt;!=&gt;)|((?!\{)(?=\S))</string>
2537+
<string>((?&lt;=\}|\S)(?&lt;!=&gt;)|((?!\{)(?=\S)))(?!\/[\/\*])</string>
25342538
<key>patterns</key>
25352539
<array>
2540+
<dict>
2541+
<key>include</key>
2542+
<string>#single-line-comment-consuming-line-ending</string>
2543+
</dict>
25362544
<dict>
25372545
<key>include</key>
25382546
<string>#decl-block</string>
@@ -4476,7 +4484,7 @@
44764484
</dict>
44774485
</dict>
44784486
<key>end</key>
4479-
<string>(?&lt;=\))|(?=[;),}\]:]|\|\||\&amp;\&amp;|$|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))new(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))</string>
4487+
<string>(?&lt;=\))|(?=[;),}\]:\-\+]|\|\||\&amp;\&amp;|$|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))new(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))</string>
44804488
<key>patterns</key>
44814489
<array>
44824490
<dict>
@@ -4542,7 +4550,7 @@
45424550
</dict>
45434551
<dict>
45444552
<key>begin</key>
4545-
<string>(?&lt;=[(=,]|=&gt;)\s*(async)?(?=\s*((((&lt;\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=&lt;&gt;]|=[^&lt;]|\&lt;\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=&lt;&gt;]|=[^&lt;])*\&gt;)*&gt;\s*))?\()|(&lt;))\s*$)</string>
4553+
<string>(?&lt;=[(=,]|=&gt;|^return|[^\._$[:alnum:]]return)\s*(async)?(?=\s*((((&lt;\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=&lt;&gt;]|=[^&lt;]|\&lt;\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=&lt;&gt;]|=[^&lt;])*\&gt;)*&gt;\s*))?\()|(&lt;))\s*$)</string>
45464554
<key>beginCaptures</key>
45474555
<dict>
45484556
<key>1</key>
@@ -5979,7 +5987,7 @@
59795987
<key>possibly-arrow-return-type</key>
59805988
<dict>
59815989
<key>begin</key>
5982-
<string>(?&lt;=\))\s*(:)(?=\s*([^&lt;&gt;\(\)\{\}]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\)|\{[^\{\}]+\})+\s*=&gt;)</string>
5990+
<string>(?&lt;=\)|^)\s*(:)(?=\s*([^&lt;&gt;\(\)\{\}]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\)|\{[^\{\}]+\})+\s*=&gt;)</string>
59835991
<key>beginCaptures</key>
59845992
<dict>
59855993
<key>1</key>
@@ -6394,10 +6402,6 @@
63946402
</dict>
63956403
<key>patterns</key>
63966404
<array>
6397-
<dict>
6398-
<key>include</key>
6399-
<string>#destructuring-parameter</string>
6400-
</dict>
64016405
<dict>
64026406
<key>match</key>
64036407
<string>(?x)(?:(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?&lt;!=|:)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\s*(\??)(?=\s*(:\s*(

0 commit comments

Comments
 (0)