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

[ts] update grammars with latest from TypeScript-TmLanguage (05e623f)

Browse source
This commit is contained in:
Martin Aeschlimann 2015-12-11 16:06:02 +01:00
parent 45f29b9988
commit d08132fcbb
2 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,6 +70,13 @@
<key>name</key>
<string>keyword.operator.assignment.ts</string>
</dict>
<key>await-modifier</key>
<dict>
<key>match</key>
<string>await</string>
<key>name</key>
<string>storage.modifier.ts</string>
</dict>
<key>block</key>
<dict>
<key>begin</key>
@ -98,11 +105,11 @@
<array>
<dict>
<key>include</key>
<string>#expression</string>
<string>#object-member</string>
</dict>
<dict>
<key>include</key>
<string>#object-member</string>
<string>#expression</string>
</dict>
</array>
</dict>
@ -116,7 +123,7 @@
<key>cast</key>
<dict>
<key>begin</key>
<string>(?:(?&lt;=return|throw|yield|[=(,:&gt;]))\s*(&lt;)(?!&lt;?\=)</string>
<string>(?:(?&lt;=return|throw|yield|await|[=(,:&gt;]))\s*(&lt;)(?!&lt;?\=)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@ -380,7 +387,7 @@
<key>field-declaration</key>
<dict>
<key>begin</key>
<string>(?&lt;!\()\s*\b([a-zA-Z_$][\w$]*)\s*(\?\s*)?(?=(=|:))</string>
<string>(?&lt;!\()\s*((?:\b[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:))</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@ -432,6 +439,10 @@
<string>functioncall.expr.ts</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#await-modifier</string>
</dict>
<dict>
<key>include</key>
<string>#type-parameters</string>
@ -445,7 +456,7 @@
<key>function-declaration</key>
<dict>
<key>begin</key>
<string>\b(?:(export)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s*</string>
<string>\b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s*</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@ -456,9 +467,14 @@
<key>2</key>
<dict>
<key>name</key>
<string>storage.type.function.ts</string>
<string>storage.modifier.ts</string>
</dict>
<key>3</key>
<dict>
<key>name</key>
<string>storage.type.function.ts</string>
</dict>
<key>4</key>
<dict>
<key>name</key>
<string>entity.name.function.ts</string>
@ -667,7 +683,7 @@
<key>method-declaration</key>
<dict>
<key>begin</key>
<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@ -683,19 +699,24 @@
<key>3</key>
<dict>
<key>name</key>
<string>storage.type.property.ts</string>
<string>storage.modifier.ts</string>
</dict>
<key>4</key>
<dict>
<key>name</key>
<string>keyword.operator.ts</string>
<string>storage.type.property.ts</string>
</dict>
<key>5</key>
<dict>
<key>name</key>
<string>entity.name.function.ts</string>
<string>keyword.operator.ts</string>
</dict>
<key>6</key>
<dict>
<key>name</key>
<string>entity.name.function.ts</string>
</dict>
<key>7</key>
<dict>
<key>name</key>
<string>keyword.operator.ts</string>

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

@ -98,11 +98,11 @@
<array>
<dict>
<key>include</key>
<string>#expression</string>
<string>#object-member</string>
</dict>
<dict>
<key>include</key>
<string>#object-member</string>
<string>#expression</string>
</dict>
</array>
</dict>
@ -348,7 +348,7 @@
<key>field-declaration</key>
<dict>
<key>begin</key>
<string>(?&lt;!\()\s*\b([a-zA-Z_$][\w$]*)\s*(\?\s*)?(?=(=|:))</string>
<string>(?&lt;!\()\s*((?:\b[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:))</string>
<key>beginCaptures</key>
<dict>
<key>1</key>