Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-27 05:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update TS/JS grammars to 59c4f26 (Feb 2)

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-02-03 17:21:24 +01:00
parent 6be375ac07
commit 09c07b7830
4 changed files with 649 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
extensions/javascript/syntaxes/JavaScriptReact.tmLanguage
View File

@@ -113,6 +113,30 @@
<key>name</key>
<string>constant.language.boolean.ts.jsx</string>
</dict>
<key>case-clause</key>
<dict>
<key>begin</key>
<string>(?&lt;!\.)\b(case|default)\b</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>keyword.control.ts.jsx</string>
</dict>
</dict>
<key>end</key>
<string>:</string>
<key>name</key>
<string>case-clause.expr.ts.jsx</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#expression</string>
</dict>
</array>
</dict>
<key>comment</key>
<dict>
<key>name</key>
@@ -296,6 +320,10 @@
<key>include</key>
<string>#new-expr</string>
</dict>
<dict>
<key>include</key>
<string>#switch-statement</string>
</dict>
<dict>
<key>include</key>
<string>#block</string>
@@ -330,7 +358,7 @@
</dict>
<dict>
<key>include</key>
<string>#switch-case</string>
<string>#case-clause</string>
</dict>
<dict>
<key>include</key>
@@ -341,7 +369,7 @@
<key>expression-operator</key>
<dict>
<key>match</key>
<string>=&gt;|\b(delete|export|import|in|instanceof|module|namespace|new|typeof|void|as)\b</string>
<string>=&gt;|\b(delete|export|import|from|in|instanceof|module|namespace|new|typeof|void|as)\b</string>
<key>name</key>
<string>keyword.operator.ts.jsx</string>
</dict>
@@ -363,7 +391,7 @@
</dict>
</dict>
<key>end</key>
<string>(?=\}|;|,)|(?&lt;=\})</string>
<string>(?=\}|;|,|$)|(?&lt;=\})</string>
<key>name</key>
<string>meta.field.declaration.ts.jsx</string>
<key>patterns</key>
@@ -596,7 +624,7 @@
<key>jsx</key>
<dict>
<key>name</key>
<string>meta.ts.jsx.ts.jsx</string>
<string>meta.jsx.ts.jsx</string>
<key>patterns</key>
<array>
<dict>
@@ -621,7 +649,7 @@
<key>end</key>
<string>(?=&lt;/)</string>
<key>name</key>
<string>meta.ts.jsx.children.ts.jsx</string>
<string>meta.jsx.children.ts.jsx</string>
<key>patterns</key>
<array>
<dict>
@@ -1323,6 +1351,10 @@
<key>include</key>
<string>#comment</string>
</dict>
<dict>
<key>include</key>
<string>#object-heritage</string>
</dict>
<dict>
<key>include</key>
<string>#type-parameters</string>
@@ -1562,22 +1594,14 @@
<key>name</key>
<string>constant.character.escape</string>
</dict>
<key>switch-case</key>
<key>switch-block</key>
<dict>
<key>begin</key>
<string>(?&lt;!\.)\b(case|default)\b</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>keyword.control.ts.jsx</string>
</dict>
</dict>
<string>{</string>
<key>end</key>
<string>:</string>
<string>(?=\})</string>
<key>name</key>
<string>case.expr.ts.jsx</string>
<string>switch-block.expr.ts.jsx</string>
<key>patterns</key>
<array>
<dict>
@@ -1586,6 +1610,50 @@
</dict>
</array>
</dict>
<key>switch-expression</key>
<dict>
<key>begin</key>
<string>\b(switch)\b\s*\(</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>keyword.operator.ts.jsx</string>
</dict>
</dict>
<key>end</key>
<string>\)</string>
<key>name</key>
<string>switch-expression.expr.ts.jsx</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#expression</string>
</dict>
</array>
</dict>
<key>switch-statement</key>
<dict>
<key>begin</key>
<string>(?=\bswitch\b\s*\()</string>
<key>end</key>
<string>}</string>
<key>name</key>
<string>switch-statement.expr.ts.jsx</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#switch-expression</string>
</dict>
<dict>
<key>include</key>
<string>#switch-block</string>
</dict>
</array>
</dict>
<key>template</key>
<dict>
<key>begin</key>
@@ -1759,7 +1827,7 @@
</dict>
</dict>
<key>end</key>
<string>(?=[,);&gt;]|var|type|function|class|interface)</string>
<string>(?=$|[,);&gt;]|var|type|function|class|interface)</string>
<key>name</key>
<string>meta.type.declaration.ts.jsx</string>
<key>patterns</key>
@@ -2004,7 +2072,7 @@
<key>var-expr</key>
<dict>
<key>begin</key>
<string>(?&lt;!\()\s*\b(var|let|const(?!\s+enum))\s+([a-zA-Z_$][\w$]*)</string>
<string>(?&lt;!\()\s*\b(var|let|const(?!\s+enum)\b)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -2012,16 +2080,39 @@
<key>name</key>
<string>storage.type.ts.jsx</string>
</dict>
<key>2</key>
</dict>
<key>end</key>
<string>(?=$|;)</string>
<key>name</key>
<string>meta.var.expr.ts.jsx</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#var-single-variable</string>
</dict>
<dict>
<key>include</key>
<string>#comment</string>
</dict>
</array>
</dict>
<key>var-single-variable</key>
<dict>
<key>begin</key>
<string>\b([a-zA-Z_$][\w$]*)\s*(=?)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>variable.ts.jsx</string>
</dict>
</dict>
<key>end</key>
<string>(?=$|[;=\}\{])|(?&lt;=\})</string>
<string>(?=$|[;,])</string>
<key>name</key>
<string>meta.var.expr.ts.jsx</string>
<string>meta.var-single-variable.expr.ts.jsx</string>
<key>patterns</key>
<array>
<dict>
@@ -2036,6 +2127,10 @@
<key>include</key>
<string>#comment</string>
</dict>
<dict>
<key>include</key>
<string>#expression</string>
</dict>
</array>
</dict>
<key>variable-initializer</key>
@@ -2066,5 +2161,4 @@
<key>uuid</key>
<string>805375ec-d614-41f5-8993-5843fe63ea82</string>
</dict>
</plist>
</plist>