maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[typescript] update grammar (Microsoft/TypeScript-TmLanguage@1cf745c)

Browse source
This commit is contained in:
Martin Aeschlimann 2016-08-02 12:13:22 +02:00
parent 893483c907
commit 2ee0412b22
4 changed files with 374 additions and 536 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

206
extensions/typescript/syntaxes/TypeScript.tmLanguage
View file

@ -123,7 +123,7 @@
<key>case-clause</key>
<dict>
<key>begin</key>
<string>(?&lt;!\.)\b(case|default)\b</string>
<string>(?&lt;!\.)\b(case|default(?=:))\b</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@ -140,7 +140,7 @@
<array>
<dict>
<key>include</key>
<string>#expression</string>
<string>#expression-type</string>
</dict>
</array>
</dict>
@ -424,6 +424,78 @@
<key>name</key>
<string>keyword.others.ts</string>
</dict>
<key>expression-type</key>
<dict>
<key>name</key>
<string>meta.expression.ts</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#string</string>
</dict>
<dict>
<key>include</key>
<string>#regex</string>
</dict>
<dict>
<key>include</key>
<string>#template</string>
</dict>
<dict>
<key>include</key>
<string>#comment</string>
</dict>
<dict>
<key>include</key>
<string>#literal</string>
</dict>
<dict>
<key>include</key>
<string>#paren-expression</string>
</dict>
<dict>
<key>include</key>
<string>#ternary-expression</string>
</dict>
<dict>
<key>include</key>
<string>#import-operator</string>
</dict>
<dict>
<key>include</key>
<string>#expression-operator</string>
</dict>
<dict>
<key>include</key>
<string>#imply-operator</string>
</dict>
<dict>
<key>include</key>
<string>#relational-operator</string>
</dict>
<dict>
<key>include</key>
<string>#arithmetic-operator</string>
</dict>
<dict>
<key>include</key>
<string>#logic-operator</string>
</dict>
<dict>
<key>include</key>
<string>#assignment-operator</string>
</dict>
<dict>
<key>include</key>
<string>#type-primitive</string>
</dict>
<dict>
<key>include</key>
<string>#function-call</string>
</dict>
</array>
</dict>
<key>field-declaration</key>
<dict>
<key>begin</key>
@ -695,48 +767,6 @@
<key>name</key>
<string>meta.indexer.parameter.ts</string>
</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.ts</string>
</dict>
</dict>
<key>end</key>
<string>(?=$)|(&gt;)</string>
<key>endCaptures</key>
<dict>
<key>2</key>
<dict>
<key>name</key>
<string>meta.brace.angle.ts</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>
@ -1065,7 +1095,7 @@
</dict>
<dict>
<key>include</key>
<string>#known-type-parameters</string>
<string>#type-parameters</string>
</dict>
<dict>
<key>include</key>
@ -1504,79 +1534,7 @@
</dict>
<dict>
<key>include</key>
<string>#ternary-expression-type</string>
</dict>
</array>
</dict>
<key>ternary-expression-type</key>
<dict>
<key>name</key>
<string>meta.expression.ts</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#string</string>
</dict>
<dict>
<key>include</key>
<string>#regex</string>
</dict>
<dict>
<key>include</key>
<string>#template</string>
</dict>
<dict>
<key>include</key>
<string>#comment</string>
</dict>
<dict>
<key>include</key>
<string>#literal</string>
</dict>
<dict>
<key>include</key>
<string>#paren-expression</string>
</dict>
<dict>
<key>include</key>
<string>#ternary-expression</string>
</dict>
<dict>
<key>include</key>
<string>#import-operator</string>
</dict>
<dict>
<key>include</key>
<string>#expression-operator</string>
</dict>
<dict>
<key>include</key>
<string>#imply-operator</string>
</dict>
<dict>
<key>include</key>
<string>#relational-operator</string>
</dict>
<dict>
<key>include</key>
<string>#arithmetic-operator</string>
</dict>
<dict>
<key>include</key>
<string>#logic-operator</string>
</dict>
<dict>
<key>include</key>
<string>#assignment-operator</string>
</dict>
<dict>
<key>include</key>
<string>#type-primitive</string>
</dict>
<dict>
<key>include</key>
<string>#function-call</string>
<string>#expression-type</string>
</dict>
</array>
</dict>
@ -1590,7 +1548,7 @@
<array>
<dict>
<key>include</key>
<string>#ternary-expression-type</string>
<string>#expression-type</string>
</dict>
</array>
</dict>
@ -1613,7 +1571,7 @@
</dict>
<dict>
<key>include</key>
<string>#known-type-parameters</string>
<string>#type-parameters</string>
</dict>
<dict>
<key>include</key>
@ -1672,7 +1630,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>
@ -1694,7 +1652,7 @@
<array>
<dict>
<key>include</key>
<string>#known-type-parameters</string>
<string>#type-parameters</string>
</dict>
<dict>
<key>include</key>
@ -1805,7 +1763,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>
@ -2035,4 +1993,4 @@
<key>uuid</key>
<string>ef98eb90-bf9b-11e4-bb52-0800200c9a66</string>
</dict>
</plist>
</plist>

154
extensions/typescript/syntaxes/TypeScriptReact.tmLanguage
View file

@ -123,7 +123,7 @@
<key>case-clause</key>
<dict>
<key>begin</key>
<string>(?&lt;!\.)\b(case|default)\b</string>
<string>(?&lt;!\.)\b(case|default(?=:))\b</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@ -140,7 +140,7 @@
<array>
<dict>
<key>include</key>
<string>#expression</string>
<string>#expression-type</string>
</dict>
</array>
</dict>
@ -392,6 +392,78 @@
<key>name</key>
<string>keyword.others.tsx</string>
</dict>
<key>expression-type</key>
<dict>
<key>name</key>
<string>meta.expression.tsx</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#string</string>
</dict>
<dict>
<key>include</key>
<string>#regex</string>
</dict>
<dict>
<key>include</key>
<string>#template</string>
</dict>
<dict>
<key>include</key>
<string>#comment</string>
</dict>
<dict>
<key>include</key>
<string>#literal</string>
</dict>
<dict>
<key>include</key>
<string>#paren-expression</string>
</dict>
<dict>
<key>include</key>
<string>#ternary-expression</string>
</dict>
<dict>
<key>include</key>
<string>#import-operator</string>
</dict>
<dict>
<key>include</key>
<string>#expression-operator</string>
</dict>
<dict>
<key>include</key>
<string>#imply-operator</string>
</dict>
<dict>
<key>include</key>
<string>#relational-operator</string>
</dict>
<dict>
<key>include</key>
<string>#arithmetic-operator</string>
</dict>
<dict>
<key>include</key>
<string>#logic-operator</string>
</dict>
<dict>
<key>include</key>
<string>#assignment-operator</string>
</dict>
<dict>
<key>include</key>
<string>#type-primitive</string>
</dict>
<dict>
<key>include</key>
<string>#function-call</string>
</dict>
</array>
</dict>
<key>field-declaration</key>
<dict>
<key>begin</key>
@ -1828,79 +1900,7 @@
</dict>
<dict>
<key>include</key>
<string>#ternary-expression-type</string>
</dict>
</array>
</dict>
<key>ternary-expression-type</key>
<dict>
<key>name</key>
<string>meta.expression.tsx</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#string</string>
</dict>
<dict>
<key>include</key>
<string>#regex</string>
</dict>
<dict>
<key>include</key>
<string>#template</string>
</dict>
<dict>
<key>include</key>
<string>#comment</string>
</dict>
<dict>
<key>include</key>
<string>#literal</string>
</dict>
<dict>
<key>include</key>
<string>#paren-expression</string>
</dict>
<dict>
<key>include</key>
<string>#ternary-expression</string>
</dict>
<dict>
<key>include</key>
<string>#import-operator</string>
</dict>
<dict>
<key>include</key>
<string>#expression-operator</string>
</dict>
<dict>
<key>include</key>
<string>#imply-operator</string>
</dict>
<dict>
<key>include</key>
<string>#relational-operator</string>
</dict>
<dict>
<key>include</key>
<string>#arithmetic-operator</string>
</dict>
<dict>
<key>include</key>
<string>#logic-operator</string>
</dict>
<dict>
<key>include</key>
<string>#assignment-operator</string>
</dict>
<dict>
<key>include</key>
<string>#type-primitive</string>
</dict>
<dict>
<key>include</key>
<string>#function-call</string>
<string>#expression-type</string>
</dict>
</array>
</dict>
@ -1914,7 +1914,7 @@
<array>
<dict>
<key>include</key>
<string>#ternary-expression-type</string>
<string>#expression-type</string>
</dict>
</array>
</dict>
@ -2359,4 +2359,4 @@
<key>uuid</key>
<string>805375ec-d614-41f5-8993-5843fe63ea82</string>
</dict>
</plist>
</plist>

1
extensions/typescript/syntaxes/grammar-version.txt Normal file
View file

@ -0,0 +1 @@
https://api.github.com/repos/Microsoft/TypeScript-TmLanguage/git/commits/1cf745cd5750d573f94f13bb9d95f4169c8a7841

549
extensions/typescript/test/colorize-results/test-issue11_ts.json
View file

File diff suppressed because it is too large Load diff