提交 ba737b58 编写于 作者: M Martin Aeschlimann

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

上级 67c1c812
...@@ -336,6 +336,10 @@ ...@@ -336,6 +336,10 @@
<key>include</key> <key>include</key>
<string>#block</string> <string>#block</string>
</dict> </dict>
<dict>
<key>include</key>
<string>#import-operator</string>
</dict>
<dict> <dict>
<key>include</key> <key>include</key>
<string>#expression-operator</string> <string>#expression-operator</string>
...@@ -381,9 +385,9 @@ ...@@ -381,9 +385,9 @@
<key>expression-operator</key> <key>expression-operator</key>
<dict> <dict>
<key>match</key> <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> <key>name</key>
<string>keyword.operator.js</string> <string>keyword.others.js</string>
</dict> </dict>
<key>field-declaration</key> <key>field-declaration</key>
<dict> <dict>
...@@ -399,7 +403,7 @@ ...@@ -399,7 +403,7 @@
<key>2</key> <key>2</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.js</string> <string>keyword.others.js</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
...@@ -426,7 +430,7 @@ ...@@ -426,7 +430,7 @@
<key>3</key> <key>3</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.js</string> <string>keyword.others.js</string>
</dict> </dict>
</dict> </dict>
<key>match</key> <key>match</key>
...@@ -463,7 +467,7 @@ ...@@ -463,7 +467,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>storage.modifier.js</string> <string>storage.type.js</string>
</dict> </dict>
<key>2</key> <key>2</key>
<dict> <dict>
...@@ -520,7 +524,7 @@ ...@@ -520,7 +524,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>storage.modifier.js</string> <string>storage.type.js</string>
</dict> </dict>
<key>2</key> <key>2</key>
<dict> <dict>
...@@ -582,6 +586,13 @@ ...@@ -582,6 +586,13 @@
</dict> </dict>
</array> </array>
</dict> </dict>
<key>import-operator</key>
<dict>
<key>match</key>
<string>\b(import|from)\b</string>
<key>name</key>
<string>keyword.control.import.include.js</string>
</dict>
<key>indexer-declaration</key> <key>indexer-declaration</key>
<dict> <dict>
<key>begin</key> <key>begin</key>
...@@ -606,7 +617,7 @@ ...@@ -606,7 +617,7 @@
<key>2</key> <key>2</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.js</string> <string>keyword.others.js</string>
</dict> </dict>
</dict> </dict>
<key>name</key> <key>name</key>
...@@ -1113,7 +1124,7 @@ ...@@ -1113,7 +1124,7 @@
<key>6</key> <key>6</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>support.type.js</string> <string>storage.type.js</string>
</dict> </dict>
<key>7</key> <key>7</key>
<dict> <dict>
...@@ -1190,7 +1201,7 @@ ...@@ -1190,7 +1201,7 @@
<key>6</key> <key>6</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>support.type.js</string> <string>storage.type.js</string>
</dict> </dict>
<key>7</key> <key>7</key>
<dict> <dict>
...@@ -1217,7 +1228,7 @@ ...@@ -1217,7 +1228,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.js</string> <string>keyword.others.js</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
...@@ -1327,7 +1338,7 @@ ...@@ -1327,7 +1338,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>storage.modifier.js</string> <string>storage.type.js</string>
</dict> </dict>
<key>2</key> <key>2</key>
<dict> <dict>
...@@ -1478,7 +1489,7 @@ ...@@ -1478,7 +1489,7 @@
<key>2</key> <key>2</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.js</string> <string>keyword.others.js</string>
</dict> </dict>
<key>3</key> <key>3</key>
<dict> <dict>
...@@ -1488,7 +1499,7 @@ ...@@ -1488,7 +1499,7 @@
<key>4</key> <key>4</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.js</string> <string>keyword.others.js</string>
</dict> </dict>
</dict> </dict>
<key>match</key> <key>match</key>
...@@ -1622,7 +1633,7 @@ ...@@ -1622,7 +1633,7 @@
<key>storage-keyword</key> <key>storage-keyword</key>
<dict> <dict>
<key>match</key> <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> <key>name</key>
<string>storage.type.js</string> <string>storage.type.js</string>
</dict> </dict>
...@@ -1674,7 +1685,7 @@ ...@@ -1674,7 +1685,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.js</string> <string>keyword.control.js</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
...@@ -1770,7 +1781,7 @@ ...@@ -1770,7 +1781,7 @@
<key>0</key> <key>0</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.js</string> <string>keyword.others.js</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
...@@ -1780,7 +1791,7 @@ ...@@ -1780,7 +1791,7 @@
<key>0</key> <key>0</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.js</string> <string>keyword.others.js</string>
</dict> </dict>
</dict> </dict>
<key>name</key> <key>name</key>
...@@ -1850,6 +1861,10 @@ ...@@ -1850,6 +1861,10 @@
<string>meta.type.annotation.js</string> <string>meta.type.annotation.js</string>
<key>patterns</key> <key>patterns</key>
<array> <array>
<dict>
<key>include</key>
<string>#expression-operator</string>
</dict>
<dict> <dict>
<key>include</key> <key>include</key>
<string>#type</string> <string>#type</string>
...@@ -1899,7 +1914,7 @@ ...@@ -1899,7 +1914,7 @@
<key>match</key> <key>match</key>
<string>=\s*</string> <string>=\s*</string>
<key>name</key> <key>name</key>
<string>keyword.operator.js</string> <string>keyword.operator.comparison.js</string>
</dict> </dict>
</array> </array>
</dict> </dict>
...@@ -1912,7 +1927,7 @@ ...@@ -1912,7 +1927,7 @@
<key>0</key> <key>0</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.js</string> <string>keyword.others.js</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
...@@ -2207,7 +2222,7 @@ ...@@ -2207,7 +2222,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.js</string> <string>keyword.others.js</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
......
...@@ -367,6 +367,10 @@ ...@@ -367,6 +367,10 @@
<key>include</key> <key>include</key>
<string>#block</string> <string>#block</string>
</dict> </dict>
<dict>
<key>include</key>
<string>#import-operator</string>
</dict>
<dict> <dict>
<key>include</key> <key>include</key>
<string>#expression-operator</string> <string>#expression-operator</string>
...@@ -412,9 +416,9 @@ ...@@ -412,9 +416,9 @@
<key>expression-operator</key> <key>expression-operator</key>
<dict> <dict>
<key>match</key> <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> <key>name</key>
<string>keyword.operator.ts</string> <string>keyword.others.ts</string>
</dict> </dict>
<key>field-declaration</key> <key>field-declaration</key>
<dict> <dict>
...@@ -430,7 +434,7 @@ ...@@ -430,7 +434,7 @@
<key>2</key> <key>2</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.ts</string> <string>keyword.others.ts</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
...@@ -457,7 +461,7 @@ ...@@ -457,7 +461,7 @@
<key>3</key> <key>3</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.ts</string> <string>keyword.others.ts</string>
</dict> </dict>
</dict> </dict>
<key>match</key> <key>match</key>
...@@ -494,7 +498,7 @@ ...@@ -494,7 +498,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>storage.modifier.ts</string> <string>storage.type.ts</string>
</dict> </dict>
<key>2</key> <key>2</key>
<dict> <dict>
...@@ -551,7 +555,7 @@ ...@@ -551,7 +555,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>storage.modifier.ts</string> <string>storage.type.ts</string>
</dict> </dict>
<key>2</key> <key>2</key>
<dict> <dict>
...@@ -613,6 +617,13 @@ ...@@ -613,6 +617,13 @@
</dict> </dict>
</array> </array>
</dict> </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> <key>indexer-declaration</key>
<dict> <dict>
<key>begin</key> <key>begin</key>
...@@ -637,7 +648,7 @@ ...@@ -637,7 +648,7 @@
<key>2</key> <key>2</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.ts</string> <string>keyword.others.ts</string>
</dict> </dict>
</dict> </dict>
<key>name</key> <key>name</key>
...@@ -746,7 +757,7 @@ ...@@ -746,7 +757,7 @@
<key>6</key> <key>6</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>support.type.ts</string> <string>storage.type.ts</string>
</dict> </dict>
<key>7</key> <key>7</key>
<dict> <dict>
...@@ -823,7 +834,7 @@ ...@@ -823,7 +834,7 @@
<key>6</key> <key>6</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>support.type.ts</string> <string>storage.type.ts</string>
</dict> </dict>
<key>7</key> <key>7</key>
<dict> <dict>
...@@ -850,7 +861,7 @@ ...@@ -850,7 +861,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.ts</string> <string>keyword.others.ts</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
...@@ -960,7 +971,7 @@ ...@@ -960,7 +971,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>storage.modifier.ts</string> <string>storage.type.ts</string>
</dict> </dict>
<key>2</key> <key>2</key>
<dict> <dict>
...@@ -1111,7 +1122,7 @@ ...@@ -1111,7 +1122,7 @@
<key>2</key> <key>2</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.ts</string> <string>keyword.others.ts</string>
</dict> </dict>
<key>3</key> <key>3</key>
<dict> <dict>
...@@ -1121,7 +1132,7 @@ ...@@ -1121,7 +1132,7 @@
<key>4</key> <key>4</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.ts</string> <string>keyword.others.ts</string>
</dict> </dict>
</dict> </dict>
<key>match</key> <key>match</key>
...@@ -1255,7 +1266,7 @@ ...@@ -1255,7 +1266,7 @@
<key>storage-keyword</key> <key>storage-keyword</key>
<dict> <dict>
<key>match</key> <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> <key>name</key>
<string>storage.type.ts</string> <string>storage.type.ts</string>
</dict> </dict>
...@@ -1307,7 +1318,7 @@ ...@@ -1307,7 +1318,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.ts</string> <string>keyword.control.ts</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
...@@ -1403,7 +1414,7 @@ ...@@ -1403,7 +1414,7 @@
<key>0</key> <key>0</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.ts</string> <string>keyword.others.ts</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
...@@ -1413,7 +1424,7 @@ ...@@ -1413,7 +1424,7 @@
<key>0</key> <key>0</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.ts</string> <string>keyword.others.ts</string>
</dict> </dict>
</dict> </dict>
<key>name</key> <key>name</key>
...@@ -1483,6 +1494,10 @@ ...@@ -1483,6 +1494,10 @@
<string>meta.type.annotation.ts</string> <string>meta.type.annotation.ts</string>
<key>patterns</key> <key>patterns</key>
<array> <array>
<dict>
<key>include</key>
<string>#expression-operator</string>
</dict>
<dict> <dict>
<key>include</key> <key>include</key>
<string>#type</string> <string>#type</string>
...@@ -1532,7 +1547,7 @@ ...@@ -1532,7 +1547,7 @@
<key>match</key> <key>match</key>
<string>=\s*</string> <string>=\s*</string>
<key>name</key> <key>name</key>
<string>keyword.operator.ts</string> <string>keyword.operator.comparison.ts</string>
</dict> </dict>
</array> </array>
</dict> </dict>
...@@ -1545,7 +1560,7 @@ ...@@ -1545,7 +1560,7 @@
<key>0</key> <key>0</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.ts</string> <string>keyword.others.ts</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
...@@ -1840,7 +1855,7 @@ ...@@ -1840,7 +1855,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.ts</string> <string>keyword.others.ts</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
......
...@@ -335,6 +335,10 @@ ...@@ -335,6 +335,10 @@
<key>include</key> <key>include</key>
<string>#block</string> <string>#block</string>
</dict> </dict>
<dict>
<key>include</key>
<string>#import-operator</string>
</dict>
<dict> <dict>
<key>include</key> <key>include</key>
<string>#expression-operator</string> <string>#expression-operator</string>
...@@ -380,9 +384,9 @@ ...@@ -380,9 +384,9 @@
<key>expression-operator</key> <key>expression-operator</key>
<dict> <dict>
<key>match</key> <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> <key>name</key>
<string>keyword.operator.tsx</string> <string>keyword.others.tsx</string>
</dict> </dict>
<key>field-declaration</key> <key>field-declaration</key>
<dict> <dict>
...@@ -398,7 +402,7 @@ ...@@ -398,7 +402,7 @@
<key>2</key> <key>2</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.tsx</string> <string>keyword.others.tsx</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
...@@ -425,7 +429,7 @@ ...@@ -425,7 +429,7 @@
<key>3</key> <key>3</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.tsx</string> <string>keyword.others.tsx</string>
</dict> </dict>
</dict> </dict>
<key>match</key> <key>match</key>
...@@ -462,7 +466,7 @@ ...@@ -462,7 +466,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>storage.modifier.tsx</string> <string>storage.type.tsx</string>
</dict> </dict>
<key>2</key> <key>2</key>
<dict> <dict>
...@@ -519,7 +523,7 @@ ...@@ -519,7 +523,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>storage.modifier.tsx</string> <string>storage.type.tsx</string>
</dict> </dict>
<key>2</key> <key>2</key>
<dict> <dict>
...@@ -581,6 +585,13 @@ ...@@ -581,6 +585,13 @@
</dict> </dict>
</array> </array>
</dict> </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> <key>indexer-declaration</key>
<dict> <dict>
<key>begin</key> <key>begin</key>
...@@ -605,7 +616,7 @@ ...@@ -605,7 +616,7 @@
<key>2</key> <key>2</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.tsx</string> <string>keyword.others.tsx</string>
</dict> </dict>
</dict> </dict>
<key>name</key> <key>name</key>
...@@ -1112,7 +1123,7 @@ ...@@ -1112,7 +1123,7 @@
<key>6</key> <key>6</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>support.type.tsx</string> <string>storage.type.tsx</string>
</dict> </dict>
<key>7</key> <key>7</key>
<dict> <dict>
...@@ -1189,7 +1200,7 @@ ...@@ -1189,7 +1200,7 @@
<key>6</key> <key>6</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>support.type.tsx</string> <string>storage.type.tsx</string>
</dict> </dict>
<key>7</key> <key>7</key>
<dict> <dict>
...@@ -1216,7 +1227,7 @@ ...@@ -1216,7 +1227,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.tsx</string> <string>keyword.others.tsx</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
...@@ -1326,7 +1337,7 @@ ...@@ -1326,7 +1337,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>storage.modifier.tsx</string> <string>storage.type.tsx</string>
</dict> </dict>
<key>2</key> <key>2</key>
<dict> <dict>
...@@ -1477,7 +1488,7 @@ ...@@ -1477,7 +1488,7 @@
<key>2</key> <key>2</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.tsx</string> <string>keyword.others.tsx</string>
</dict> </dict>
<key>3</key> <key>3</key>
<dict> <dict>
...@@ -1487,7 +1498,7 @@ ...@@ -1487,7 +1498,7 @@
<key>4</key> <key>4</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.tsx</string> <string>keyword.others.tsx</string>
</dict> </dict>
</dict> </dict>
<key>match</key> <key>match</key>
...@@ -1621,7 +1632,7 @@ ...@@ -1621,7 +1632,7 @@
<key>storage-keyword</key> <key>storage-keyword</key>
<dict> <dict>
<key>match</key> <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> <key>name</key>
<string>storage.type.tsx</string> <string>storage.type.tsx</string>
</dict> </dict>
...@@ -1673,7 +1684,7 @@ ...@@ -1673,7 +1684,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.tsx</string> <string>keyword.control.tsx</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
...@@ -1769,7 +1780,7 @@ ...@@ -1769,7 +1780,7 @@
<key>0</key> <key>0</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.tsx</string> <string>keyword.others.tsx</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
...@@ -1779,7 +1790,7 @@ ...@@ -1779,7 +1790,7 @@
<key>0</key> <key>0</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.tsx</string> <string>keyword.others.tsx</string>
</dict> </dict>
</dict> </dict>
<key>name</key> <key>name</key>
...@@ -1849,6 +1860,10 @@ ...@@ -1849,6 +1860,10 @@
<string>meta.type.annotation.tsx</string> <string>meta.type.annotation.tsx</string>
<key>patterns</key> <key>patterns</key>
<array> <array>
<dict>
<key>include</key>
<string>#expression-operator</string>
</dict>
<dict> <dict>
<key>include</key> <key>include</key>
<string>#type</string> <string>#type</string>
...@@ -1898,7 +1913,7 @@ ...@@ -1898,7 +1913,7 @@
<key>match</key> <key>match</key>
<string>=\s*</string> <string>=\s*</string>
<key>name</key> <key>name</key>
<string>keyword.operator.tsx</string> <string>keyword.operator.comparison.tsx</string>
</dict> </dict>
</array> </array>
</dict> </dict>
...@@ -1911,7 +1926,7 @@ ...@@ -1911,7 +1926,7 @@
<key>0</key> <key>0</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.tsx</string> <string>keyword.others.tsx</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
...@@ -2206,7 +2221,7 @@ ...@@ -2206,7 +2221,7 @@
<key>1</key> <key>1</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>keyword.operator.tsx</string> <string>keyword.others.tsx</string>
</dict> </dict>
</dict> </dict>
<key>end</key> <key>end</key>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册