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

Update Typescript & JavaScript grammars with fix for TypeScript-TmLanguage/37

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-03-12 14:58:07 +01:00
parent 67c1c8123d
commit ba737b58dc
3 changed files with 105 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
extensions/typescript/syntaxes/TypeScript.tmLanguage
View File

@@ -367,6 +367,10 @@
<key>include</key>
<string>#block</string>
</dict>
<dict>
<key>include</key>
<string>#import-operator</string>
</dict>
<dict>
<key>include</key>
<string>#expression-operator</string>
@@ -412,9 +416,9 @@
<key>expression-operator</key>
<dict>
<key>match</key>
<string>=&gt;|\b(delete|export|import|from|in|instanceof|new|typeof|void|as)\b</string>
<string>=&gt;|\b(delete|in|instanceof|new|typeof|as|is|of)\b</string>
<key>name</key>
<string>keyword.operator.ts</string>
<string>keyword.others.ts</string>
</dict>
<key>field-declaration</key>
<dict>
@@ -430,7 +434,7 @@
<key>2</key>
<dict>
<key>name</key>
<string>keyword.operator.ts</string>
<string>keyword.others.ts</string>
</dict>
</dict>
<key>end</key>
@@ -457,7 +461,7 @@
<key>3</key>
<dict>
<key>name</key>
<string>keyword.operator.ts</string>
<string>keyword.others.ts</string>
</dict>
</dict>
<key>match</key>
@@ -494,7 +498,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>storage.modifier.ts</string>
<string>storage.type.ts</string>
</dict>
<key>2</key>
<dict>
@@ -551,7 +555,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>storage.modifier.ts</string>
<string>storage.type.ts</string>
</dict>
<key>2</key>
<dict>
@@ -613,6 +617,13 @@
</dict>
</array>
</dict>
<key>import-operator</key>
<dict>
<key>match</key>
<string>\b(import|from)\b</string>
<key>name</key>
<string>keyword.control.import.include.ts</string>
</dict>
<key>indexer-declaration</key>
<dict>
<key>begin</key>
@@ -637,7 +648,7 @@
<key>2</key>
<dict>
<key>name</key>
<string>keyword.operator.ts</string>
<string>keyword.others.ts</string>
</dict>
</dict>
<key>name</key>
@@ -746,7 +757,7 @@
<key>6</key>
<dict>
<key>name</key>
<string>support.type.ts</string>
<string>storage.type.ts</string>
</dict>
<key>7</key>
<dict>
@@ -823,7 +834,7 @@
<key>6</key>
<dict>
<key>name</key>
<string>support.type.ts</string>
<string>storage.type.ts</string>
</dict>
<key>7</key>
<dict>
@@ -850,7 +861,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>keyword.operator.ts</string>
<string>keyword.others.ts</string>
</dict>
</dict>
<key>end</key>
@@ -960,7 +971,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>storage.modifier.ts</string>
<string>storage.type.ts</string>
</dict>
<key>2</key>
<dict>
@@ -1111,7 +1122,7 @@
<key>2</key>
<dict>
<key>name</key>
<string>keyword.operator.ts</string>
<string>keyword.others.ts</string>
</dict>
<key>3</key>
<dict>
@@ -1121,7 +1132,7 @@
<key>4</key>
<dict>
<key>name</key>
<string>keyword.operator.ts</string>
<string>keyword.others.ts</string>
</dict>
</dict>
<key>match</key>
@@ -1255,7 +1266,7 @@
<key>storage-keyword</key>
<dict>
<key>match</key>
<string>\b(var|let|function|const|module|namespace)\b</string>
<string>\b(var|let|function|const|module|namespace|void|export)\b</string>
<key>name</key>
<string>storage.type.ts</string>
</dict>
@@ -1307,7 +1318,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>keyword.operator.ts</string>
<string>keyword.control.ts</string>
</dict>
</dict>
<key>end</key>
@@ -1403,7 +1414,7 @@
<key>0</key>
<dict>
<key>name</key>
<string>keyword.operator.ts</string>
<string>keyword.others.ts</string>
</dict>
</dict>
<key>end</key>
@@ -1413,7 +1424,7 @@
<key>0</key>
<dict>
<key>name</key>
<string>keyword.operator.ts</string>
<string>keyword.others.ts</string>
</dict>
</dict>
<key>name</key>
@@ -1483,6 +1494,10 @@
<string>meta.type.annotation.ts</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#expression-operator</string>
</dict>
<dict>
<key>include</key>
<string>#type</string>
@@ -1532,7 +1547,7 @@
<key>match</key>
<string>=\s*</string>
<key>name</key>
<string>keyword.operator.ts</string>
<string>keyword.operator.comparison.ts</string>
</dict>
</array>
</dict>
@@ -1545,7 +1560,7 @@
<key>0</key>
<dict>
<key>name</key>
<string>keyword.operator.ts</string>
<string>keyword.others.ts</string>
</dict>
</dict>
<key>end</key>
@@ -1840,7 +1855,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>keyword.operator.ts</string>
<string>keyword.others.ts</string>
</dict>
</dict>
<key>end</key>

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

@@ -335,6 +335,10 @@
<key>include</key>
<string>#block</string>
</dict>
<dict>
<key>include</key>
<string>#import-operator</string>
</dict>
<dict>
<key>include</key>
<string>#expression-operator</string>
@@ -380,9 +384,9 @@
<key>expression-operator</key>
<dict>
<key>match</key>
<string>=&gt;|\b(delete|export|import|from|in|instanceof|new|typeof|void|as)\b</string>
<string>=&gt;|\b(delete|in|instanceof|new|typeof|as|is|of)\b</string>
<key>name</key>
<string>keyword.operator.tsx</string>
<string>keyword.others.tsx</string>
</dict>
<key>field-declaration</key>
<dict>
@@ -398,7 +402,7 @@
<key>2</key>
<dict>
<key>name</key>
<string>keyword.operator.tsx</string>
<string>keyword.others.tsx</string>
</dict>
</dict>
<key>end</key>
@@ -425,7 +429,7 @@
<key>3</key>
<dict>
<key>name</key>
<string>keyword.operator.tsx</string>
<string>keyword.others.tsx</string>
</dict>
</dict>
<key>match</key>
@@ -462,7 +466,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>storage.modifier.tsx</string>
<string>storage.type.tsx</string>
</dict>
<key>2</key>
<dict>
@@ -519,7 +523,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>storage.modifier.tsx</string>
<string>storage.type.tsx</string>
</dict>
<key>2</key>
<dict>
@@ -581,6 +585,13 @@
</dict>
</array>
</dict>
<key>import-operator</key>
<dict>
<key>match</key>
<string>\b(import|from)\b</string>
<key>name</key>
<string>keyword.control.import.include.tsx</string>
</dict>
<key>indexer-declaration</key>
<dict>
<key>begin</key>
@@ -605,7 +616,7 @@
<key>2</key>
<dict>
<key>name</key>
<string>keyword.operator.tsx</string>
<string>keyword.others.tsx</string>
</dict>
</dict>
<key>name</key>
@@ -1112,7 +1123,7 @@
<key>6</key>
<dict>
<key>name</key>
<string>support.type.tsx</string>
<string>storage.type.tsx</string>
</dict>
<key>7</key>
<dict>
@@ -1189,7 +1200,7 @@
<key>6</key>
<dict>
<key>name</key>
<string>support.type.tsx</string>
<string>storage.type.tsx</string>
</dict>
<key>7</key>
<dict>
@@ -1216,7 +1227,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>keyword.operator.tsx</string>
<string>keyword.others.tsx</string>
</dict>
</dict>
<key>end</key>
@@ -1326,7 +1337,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>storage.modifier.tsx</string>
<string>storage.type.tsx</string>
</dict>
<key>2</key>
<dict>
@@ -1477,7 +1488,7 @@
<key>2</key>
<dict>
<key>name</key>
<string>keyword.operator.tsx</string>
<string>keyword.others.tsx</string>
</dict>
<key>3</key>
<dict>
@@ -1487,7 +1498,7 @@
<key>4</key>
<dict>
<key>name</key>
<string>keyword.operator.tsx</string>
<string>keyword.others.tsx</string>
</dict>
</dict>
<key>match</key>
@@ -1621,7 +1632,7 @@
<key>storage-keyword</key>
<dict>
<key>match</key>
<string>\b(var|let|function|const|module|namespace)\b</string>
<string>\b(var|let|function|const|module|namespace|void|export)\b</string>
<key>name</key>
<string>storage.type.tsx</string>
</dict>
@@ -1673,7 +1684,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>keyword.operator.tsx</string>
<string>keyword.control.tsx</string>
</dict>
</dict>
<key>end</key>
@@ -1769,7 +1780,7 @@
<key>0</key>
<dict>
<key>name</key>
<string>keyword.operator.tsx</string>
<string>keyword.others.tsx</string>
</dict>
</dict>
<key>end</key>
@@ -1779,7 +1790,7 @@
<key>0</key>
<dict>
<key>name</key>
<string>keyword.operator.tsx</string>
<string>keyword.others.tsx</string>
</dict>
</dict>
<key>name</key>
@@ -1849,6 +1860,10 @@
<string>meta.type.annotation.tsx</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#expression-operator</string>
</dict>
<dict>
<key>include</key>
<string>#type</string>
@@ -1898,7 +1913,7 @@
<key>match</key>
<string>=\s*</string>
<key>name</key>
<string>keyword.operator.tsx</string>
<string>keyword.operator.comparison.tsx</string>
</dict>
</array>
</dict>
@@ -1911,7 +1926,7 @@
<key>0</key>
<dict>
<key>name</key>
<string>keyword.operator.tsx</string>
<string>keyword.others.tsx</string>
</dict>
</dict>
<key>end</key>
@@ -2206,7 +2221,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>keyword.operator.tsx</string>
<string>keyword.others.tsx</string>
</dict>
</dict>
<key>end</key>