Skip to content

Commit a22f8a3

Browse files
DanielRosenwasserDanielRosenwasser
committed
Update tmLanguage/grammar files.
1 parent c525eb0 commit a22f8a3

File tree

2 files changed

+186
-20
lines changed

2 files changed

+186
-20
lines changed

‎TypeScript.tmLanguage

+93-10
Original file line numberDiff line numberDiff line change
@@ -3804,12 +3804,67 @@
38043804
<key>match</key>
38053805
<string>\bfrom\b</string>
38063806
</dict>
3807+
<dict>
3808+
<key>include</key>
3809+
<string>#import-export-assert-clause</string>
3810+
</dict>
38073811
<dict>
38083812
<key>include</key>
38093813
<string>#import-export-clause</string>
38103814
</dict>
38113815
</array>
38123816
</dict>
3817+
<key>import-export-assert-clause</key>
3818+
<dict>
3819+
<key>begin</key>
3820+
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(assert)\s*(\{)</string>
3821+
<key>beginCaptures</key>
3822+
<dict>
3823+
<key>1</key>
3824+
<dict>
3825+
<key>name</key>
3826+
<string>keyword.control.assert.ts</string>
3827+
</dict>
3828+
<key>2</key>
3829+
<dict>
3830+
<key>name</key>
3831+
<string>punctuation.definition.block.ts</string>
3832+
</dict>
3833+
</dict>
3834+
<key>end</key>
3835+
<string>\}</string>
3836+
<key>endCaptures</key>
3837+
<dict>
3838+
<key>0</key>
3839+
<dict>
3840+
<key>name</key>
3841+
<string>punctuation.definition.block.ts</string>
3842+
</dict>
3843+
</dict>
3844+
<key>patterns</key>
3845+
<array>
3846+
<dict>
3847+
<key>include</key>
3848+
<string>#comment</string>
3849+
</dict>
3850+
<dict>
3851+
<key>include</key>
3852+
<string>#string</string>
3853+
</dict>
3854+
<dict>
3855+
<key>name</key>
3856+
<string>meta.object-literal.key.ts</string>
3857+
<key>match</key>
3858+
<string>(?:[_$[:alpha:]][_$[:alnum:]]*)\s*(?=(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*:)</string>
3859+
</dict>
3860+
<dict>
3861+
<key>name</key>
3862+
<string>punctuation.separator.key-value.ts</string>
3863+
<key>match</key>
3864+
<string>:</string>
3865+
</dict>
3866+
</array>
3867+
</dict>
38133868
<key>import-export-block</key>
38143869
<dict>
38153870
<key>name</key>
@@ -6962,7 +7017,7 @@
69627017
<key>name</key>
69637018
<string>storage.modifier.ts</string>
69647019
<key>match</key>
6965-
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(extends)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
7020+
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(extends|in|out)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
69667021
</dict>
69677022
<dict>
69687023
<key>include</key>
@@ -7076,11 +7131,11 @@
70767131
</dict>
70777132
<dict>
70787133
<key>include</key>
7079-
<string>#type-conditional</string>
7134+
<string>#type-operators</string>
70807135
</dict>
70817136
<dict>
70827137
<key>include</key>
7083-
<string>#type-operators</string>
7138+
<string>#type-conditional</string>
70847139
</dict>
70857140
<dict>
70867141
<key>include</key>
@@ -7630,6 +7685,10 @@
76307685
<key>include</key>
76317686
<string>#typeof-operator</string>
76327687
</dict>
7688+
<dict>
7689+
<key>include</key>
7690+
<string>#type-infer</string>
7691+
</dict>
76337692
<dict>
76347693
<key>begin</key>
76357694
<string>([&amp;|])(?=\s*\{)</string>
@@ -7679,15 +7738,39 @@
76797738
</dict>
76807739
<dict>
76817740
<key>name</key>
7682-
<string>keyword.operator.expression.infer.ts</string>
7741+
<string>keyword.operator.expression.import.ts</string>
76837742
<key>match</key>
7684-
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))infer(?=\s+[_$[:alpha:]])</string>
7743+
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))import(?=\s*\()</string>
76857744
</dict>
7745+
</array>
7746+
</dict>
7747+
<key>type-infer</key>
7748+
<dict>
7749+
<key>patterns</key>
7750+
<array>
76867751
<dict>
7687-
<key>name</key>
7688-
<string>keyword.operator.expression.import.ts</string>
76897752
<key>match</key>
7690-
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))import(?=\s*\()</string>
7753+
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(infer)\s+([_$[:alpha:]][_$[:alnum:]]*)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))(?:\s+(extends)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))?</string>
7754+
<key>name</key>
7755+
<string>meta.type.infer.ts</string>
7756+
<key>captures</key>
7757+
<dict>
7758+
<key>1</key>
7759+
<dict>
7760+
<key>name</key>
7761+
<string>keyword.operator.expression.infer.ts</string>
7762+
</dict>
7763+
<key>2</key>
7764+
<dict>
7765+
<key>name</key>
7766+
<string>entity.name.type.ts</string>
7767+
</dict>
7768+
<key>3</key>
7769+
<dict>
7770+
<key>name</key>
7771+
<string>keyword.operator.expression.extends.ts</string>
7772+
</dict>
7773+
</dict>
76917774
</dict>
76927775
</array>
76937776
</dict>
@@ -8728,7 +8811,7 @@
87288811
<key>name</key>
87298812
<string>comment.line.triple-slash.directive.ts</string>
87308813
<key>begin</key>
8731-
<string>^(///)\s*(?=&lt;(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|lib|name)\s*=\s*((\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)))+\s*/&gt;\s*$)</string>
8814+
<string>^(///)\s*(?=&lt;(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|lib|name|resolution-mode)\s*=\s*((\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)))+\s*/&gt;\s*$)</string>
87328815
<key>beginCaptures</key>
87338816
<dict>
87348817
<key>1</key>
@@ -8775,7 +8858,7 @@
87758858
<key>name</key>
87768859
<string>entity.other.attribute-name.directive.ts</string>
87778860
<key>match</key>
8778-
<string>path|types|no-default-lib|lib|name</string>
8861+
<string>path|types|no-default-lib|lib|name|resolution-mode</string>
87798862
</dict>
87808863
<dict>
87818864
<key>name</key>

‎TypeScriptReact.tmLanguage

+93-10
Original file line numberDiff line numberDiff line change
@@ -3826,12 +3826,67 @@
38263826
<key>match</key>
38273827
<string>\bfrom\b</string>
38283828
</dict>
3829+
<dict>
3830+
<key>include</key>
3831+
<string>#import-export-assert-clause</string>
3832+
</dict>
38293833
<dict>
38303834
<key>include</key>
38313835
<string>#import-export-clause</string>
38323836
</dict>
38333837
</array>
38343838
</dict>
3839+
<key>import-export-assert-clause</key>
3840+
<dict>
3841+
<key>begin</key>
3842+
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(assert)\s*(\{)</string>
3843+
<key>beginCaptures</key>
3844+
<dict>
3845+
<key>1</key>
3846+
<dict>
3847+
<key>name</key>
3848+
<string>keyword.control.assert.tsx</string>
3849+
</dict>
3850+
<key>2</key>
3851+
<dict>
3852+
<key>name</key>
3853+
<string>punctuation.definition.block.tsx</string>
3854+
</dict>
3855+
</dict>
3856+
<key>end</key>
3857+
<string>\}</string>
3858+
<key>endCaptures</key>
3859+
<dict>
3860+
<key>0</key>
3861+
<dict>
3862+
<key>name</key>
3863+
<string>punctuation.definition.block.tsx</string>
3864+
</dict>
3865+
</dict>
3866+
<key>patterns</key>
3867+
<array>
3868+
<dict>
3869+
<key>include</key>
3870+
<string>#comment</string>
3871+
</dict>
3872+
<dict>
3873+
<key>include</key>
3874+
<string>#string</string>
3875+
</dict>
3876+
<dict>
3877+
<key>name</key>
3878+
<string>meta.object-literal.key.tsx</string>
3879+
<key>match</key>
3880+
<string>(?:[_$[:alpha:]][_$[:alnum:]]*)\s*(?=(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*:)</string>
3881+
</dict>
3882+
<dict>
3883+
<key>name</key>
3884+
<string>punctuation.separator.key-value.tsx</string>
3885+
<key>match</key>
3886+
<string>:</string>
3887+
</dict>
3888+
</array>
3889+
</dict>
38353890
<key>import-export-block</key>
38363891
<dict>
38373892
<key>name</key>
@@ -6910,7 +6965,7 @@
69106965
<key>name</key>
69116966
<string>storage.modifier.tsx</string>
69126967
<key>match</key>
6913-
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(extends)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
6968+
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(extends|in|out)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
69146969
</dict>
69156970
<dict>
69166971
<key>include</key>
@@ -7024,11 +7079,11 @@
70247079
</dict>
70257080
<dict>
70267081
<key>include</key>
7027-
<string>#type-conditional</string>
7082+
<string>#type-operators</string>
70287083
</dict>
70297084
<dict>
70307085
<key>include</key>
7031-
<string>#type-operators</string>
7086+
<string>#type-conditional</string>
70327087
</dict>
70337088
<dict>
70347089
<key>include</key>
@@ -7578,6 +7633,10 @@
75787633
<key>include</key>
75797634
<string>#typeof-operator</string>
75807635
</dict>
7636+
<dict>
7637+
<key>include</key>
7638+
<string>#type-infer</string>
7639+
</dict>
75817640
<dict>
75827641
<key>begin</key>
75837642
<string>([&amp;|])(?=\s*\{)</string>
@@ -7627,15 +7686,39 @@
76277686
</dict>
76287687
<dict>
76297688
<key>name</key>
7630-
<string>keyword.operator.expression.infer.tsx</string>
7689+
<string>keyword.operator.expression.import.tsx</string>
76317690
<key>match</key>
7632-
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))infer(?=\s+[_$[:alpha:]])</string>
7691+
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))import(?=\s*\()</string>
76337692
</dict>
7693+
</array>
7694+
</dict>
7695+
<key>type-infer</key>
7696+
<dict>
7697+
<key>patterns</key>
7698+
<array>
76347699
<dict>
7635-
<key>name</key>
7636-
<string>keyword.operator.expression.import.tsx</string>
76377700
<key>match</key>
7638-
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))import(?=\s*\()</string>
7701+
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(infer)\s+([_$[:alpha:]][_$[:alnum:]]*)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))(?:\s+(extends)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))?</string>
7702+
<key>name</key>
7703+
<string>meta.type.infer.tsx</string>
7704+
<key>captures</key>
7705+
<dict>
7706+
<key>1</key>
7707+
<dict>
7708+
<key>name</key>
7709+
<string>keyword.operator.expression.infer.tsx</string>
7710+
</dict>
7711+
<key>2</key>
7712+
<dict>
7713+
<key>name</key>
7714+
<string>entity.name.type.tsx</string>
7715+
</dict>
7716+
<key>3</key>
7717+
<dict>
7718+
<key>name</key>
7719+
<string>keyword.operator.expression.extends.tsx</string>
7720+
</dict>
7721+
</dict>
76397722
</dict>
76407723
</array>
76417724
</dict>
@@ -8676,7 +8759,7 @@
86768759
<key>name</key>
86778760
<string>comment.line.triple-slash.directive.tsx</string>
86788761
<key>begin</key>
8679-
<string>^(///)\s*(?=&lt;(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|lib|name)\s*=\s*((\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)))+\s*/&gt;\s*$)</string>
8762+
<string>^(///)\s*(?=&lt;(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|lib|name|resolution-mode)\s*=\s*((\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)))+\s*/&gt;\s*$)</string>
86808763
<key>beginCaptures</key>
86818764
<dict>
86828765
<key>1</key>
@@ -8723,7 +8806,7 @@
87238806
<key>name</key>
87248807
<string>entity.other.attribute-name.directive.tsx</string>
87258808
<key>match</key>
8726-
<string>path|types|no-default-lib|lib|name</string>
8809+
<string>path|types|no-default-lib|lib|name|resolution-mode</string>
87278810
</dict>
87288811
<dict>
87298812
<key>name</key>

0 commit comments

Comments
 (0)