提交 09c07b78 编写于 作者: M Martin Aeschlimann

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

上级 6be375ac
......@@ -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,38 @@
<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>
<string>{</string>
<key>end</key>
<string>(?=\})</string>
<key>name</key>
<string>switch-block.expr.ts.jsx</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#expression</string>
</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.control.ts.jsx</string>
<string>keyword.operator.ts.jsx</string>
</dict>
</dict>
<key>end</key>
<string>:</string>
<string>\)</string>
<key>name</key>
<string>case.expr.ts.jsx</string>
<string>switch-expression.expr.ts.jsx</string>
<key>patterns</key>
<array>
<dict>
......@@ -1586,6 +1634,26 @@
</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>
\ No newline at end of file
......@@ -120,6 +120,30 @@
<key>name</key>
<string>constant.language.boolean.ts</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</string>
</dict>
</dict>
<key>end</key>
<string>:</string>
<key>name</key>
<string>case-clause.expr.ts</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#expression</string>
</dict>
</array>
</dict>
<key>cast</key>
<dict>
<key>begin</key>
......@@ -335,6 +359,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>
......@@ -369,7 +397,7 @@
</dict>
<dict>
<key>include</key>
<string>#switch-case</string>
<string>#case-clause</string>
</dict>
<dict>
<key>include</key>
......@@ -380,7 +408,7 @@
<key>expression-operator</key>
<dict>
<key>match</key>
<string>=&gt;|\b(delete|export|import|in|instanceof|module|namespace|new|typeof|void)\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</string>
</dict>
......@@ -402,7 +430,7 @@
</dict>
</dict>
<key>end</key>
<string>(?=\}|;|,)|(?&lt;=\})</string>
<string>(?=\}|;|,|$)|(?&lt;=\})</string>
<key>name</key>
<string>meta.field.declaration.ts</string>
<key>patterns</key>
......@@ -766,21 +794,36 @@
<key>2</key>
<dict>
<key>name</key>
<string>keyword.operator.ts</string>
<string>storage.modifier.ts</string>
</dict>
<key>3</key>
<dict>
<key>name</key>
<string>entity.name.function.ts</string>
<string>storage.modifier.ts</string>
</dict>
<key>4</key>
<dict>
<key>name</key>
<string>storage.type.property.ts</string>
</dict>
<key>5</key>
<dict>
<key>name</key>
<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>
</dict>
</dict>
<key>match</key>
<string>\b(?:(public|private|protected)\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>name</key>
<string>meta.method.overload.declaration.ts</string>
</dict>
......@@ -982,6 +1025,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>
......@@ -1221,22 +1268,38 @@
<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>
<string>{</string>
<key>end</key>
<string>(?=\})</string>
<key>name</key>
<string>switch-block.expr.ts</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#expression</string>
</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.control.ts</string>
<string>keyword.operator.ts</string>
</dict>
</dict>
<key>end</key>
<string>:</string>
<string>\)</string>
<key>name</key>
<string>case.expr.ts</string>
<string>switch-expression.expr.ts</string>
<key>patterns</key>
<array>
<dict>
......@@ -1245,6 +1308,26 @@
</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</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>
......@@ -1418,7 +1501,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</string>
<key>patterns</key>
......@@ -1663,7 +1746,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>
......@@ -1671,16 +1754,39 @@
<key>name</key>
<string>storage.type.ts</string>
</dict>
<key>2</key>
</dict>
<key>end</key>
<string>(?=$|;)</string>
<key>name</key>
<string>meta.var.expr.ts</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</string>
</dict>
</dict>
<key>end</key>
<string>(?=$|[;=\}\{])|(?&lt;=\})</string>
<string>(?=$|[;,])</string>
<key>name</key>
<string>meta.var.expr.ts</string>
<string>meta.var-single-variable.expr.ts</string>
<key>patterns</key>
<array>
<dict>
......@@ -1695,6 +1801,10 @@
<key>include</key>
<string>#comment</string>
</dict>
<dict>
<key>include</key>
<string>#expression</string>
</dict>
</array>
</dict>
<key>variable-initializer</key>
......@@ -1725,4 +1835,5 @@
<key>uuid</key>
<string>ef98eb90-bf9b-11e4-bb52-0800200c9a66</string>
</dict>
</plist>
\ No newline at end of file
</plist>
......@@ -113,6 +113,30 @@
<key>name</key>
<string>constant.language.boolean.ts.tsx</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.tsx</string>
</dict>
</dict>
<key>end</key>
<string>:</string>
<key>name</key>
<string>case-clause.expr.ts.tsx</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.tsx</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.tsx</string>
<key>patterns</key>
......@@ -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,38 @@
<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>
<string>{</string>
<key>end</key>
<string>(?=\})</string>
<key>name</key>
<string>switch-block.expr.ts.tsx</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#expression</string>
</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.control.ts.tsx</string>
<string>keyword.operator.ts.tsx</string>
</dict>
</dict>
<key>end</key>
<string>:</string>
<string>\)</string>
<key>name</key>
<string>case.expr.ts.tsx</string>
<string>switch-expression.expr.ts.tsx</string>
<key>patterns</key>
<array>
<dict>
......@@ -1586,6 +1634,26 @@
</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.tsx</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.tsx</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.tsx</string>
</dict>
<key>2</key>
</dict>
<key>end</key>
<string>(?=$|;)</string>
<key>name</key>
<string>meta.var.expr.ts.tsx</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.tsx</string>
</dict>
</dict>
<key>end</key>
<string>(?=$|[;=\}\{])|(?&lt;=\})</string>
<string>(?=$|[;,])</string>
<key>name</key>
<string>meta.var.expr.ts.tsx</string>
<string>meta.var-single-variable.expr.ts.tsx</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>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册