Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #8045: Syntax highlight issue in .tsx files using generics

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-07-08 11:18:11 +02:00
parent ea6373c577
commit 6507005279
3 changed files with 354 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
extensions/typescript/syntaxes/TypeScriptReact.tmLanguage
View File

@@ -1061,48 +1061,6 @@
</dict>
</array>
</dict>
<key>known-type-parameters</key>
<dict>
<key>begin</key>
<string>(&lt;)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>meta.brace.angle.tsx</string>
</dict>
</dict>
<key>end</key>
<string>(?=$)|(&gt;)</string>
<key>endCaptures</key>
<dict>
<key>2</key>
<dict>
<key>name</key>
<string>meta.brace.angle.tsx</string>
</dict>
</dict>
<key>name</key>
<string>meta.known.type.parameters.ts</string>
<key>patterns</key>
<array>
<dict>
<key>match</key>
<string>\b(extends)\b</string>
<key>name</key>
<string>keyword.other.ts</string>
</dict>
<dict>
<key>include</key>
<string>#comment</string>
</dict>
<dict>
<key>include</key>
<string>#type</string>
</dict>
</array>
</dict>
<key>literal</key>
<dict>
<key>name</key>
@@ -1431,7 +1389,7 @@
</dict>
<dict>
<key>include</key>
<string>#know-type-parameters</string>
<string>#type-parameters</string>
</dict>
<dict>
<key>include</key>
@@ -1979,7 +1937,7 @@
</dict>
<dict>
<key>include</key>
<string>#known-type-parameters</string>
<string>#type-parameters</string>
</dict>
<dict>
<key>include</key>
@@ -2038,7 +1996,7 @@
<key>type-declaration</key>
<dict>
<key>begin</key>
<string>\b(type)\b\s+([a-zA-Z_$][\w$]*)</string>
<string>\b(type)\b\s+([a-zA-Z_$][\w$]*)\s*</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -2060,7 +2018,7 @@
<array>
<dict>
<key>include</key>
<string>#known-type-parameters</string>
<string>#type-parameters</string>
</dict>
<dict>
<key>include</key>
@@ -2171,7 +2129,7 @@
<key>type-parameters</key>
<dict>
<key>begin</key>
<string>([a-zA-Z_$][\w$]*)?\s*(&lt;)(?=[^&lt;]*(&lt;[^&lt;&gt;]*&gt;)*&gt;\s*[(])</string>
<string>([a-zA-Z_$][\w$]*)?(&lt;)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>