Merge remote-tracking branch 'origin/master' into issue_63

Author: anubmat

README.md

@@ -1,4 +1,5 @@
 # TypeScript-TmLanguage
+[![Build status](https://ci.appveyor.com/api/projects/status/i7fp97q9nc5uw5kf?svg=true)](https://ci.appveyor.com/project/zhengbli/typescript-tmlanguage)
 
 This repository contains TmLanguage files that are consumed by TypeScript editors and plugins such as [Visual Studio Code](https://github.com/Microsoft/vscode), [The TypeScript Sublime Plugin](https://github.com/Microsoft/TypeScript-Sublime-Plugin), [Atom TypeScript](https://github.com/TypeStrong/atom-typescript), and possibly others.
 
@@ -14,4 +15,4 @@ Test are run from within the ```tests``` folder
 cd tests
 npm install         # Installs dependencies required for testing
 npm test            # Compiles & runs tests
-```
+```

TypeScript.YAML-tmLanguage

@@ -490,7 +490,7 @@ repository:
 
   expression-operator:
     name: keyword.operator.ts
-    match: =>|\b(delete|export|import|from|in|instanceof|module|namespace|new|typeof|void|as)\b
+    match: =>|\b(delete|export|import|from|in|instanceof|new|typeof|void|as)\b
 
   arithmetic-operator:
     name: keyword.operator.arithmetic.ts
@@ -510,7 +510,7 @@ repository:
 
   storage-keyword:
     name: storage.type.ts
-    match: \b(number|boolean|string|any|var|let|function|const)\b
+    match: \b(number|boolean|string|any|var|let|function|const|module|namespace)\b
 
   paren-expression:
     begin: \(

TypeScript.tmLanguage

@@ -408,7 +408,7 @@
 		<key>expression-operator</key>
 		<dict>
 			<key>match</key>
-			<string>=&gt;|\b(delete|export|import|from|in|instanceof|module|namespace|new|typeof|void|as)\b</string>
+			<string>=&gt;|\b(delete|export|import|from|in|instanceof|new|typeof|void|as)\b</string>
 			<key>name</key>
 			<string>keyword.operator.ts</string>
 		</dict>
@@ -1241,7 +1241,7 @@
 		<key>storage-keyword</key>
 		<dict>
 			<key>match</key>
-			<string>\b(number|boolean|string|any|var|let|function|const)\b</string>
+			<string>\b(number|boolean|string|any|var|let|function|const|module|namespace)\b</string>
 			<key>name</key>
 			<string>storage.type.ts</string>
 		</dict>

TypeScriptReact.YAML-tmLanguage

@@ -328,7 +328,7 @@ repository:
 
   await-modifier:
     name: storage.modifier.tsx
-    match: 'await'
+    match: '\bawait\b'
 
   type-operator:
     name: keyword.operator.type.tsx
@@ -478,7 +478,7 @@ repository:
 
   expression-operator:
     name: keyword.operator.tsx
-    match: =>|\b(delete|export|import|from|in|instanceof|module|namespace|new|typeof|void|as)\b
+    match: =>|\b(delete|export|import|from|in|instanceof|new|typeof|void|as)\b
 
   arithmetic-operator:
     name: keyword.operator.arithmetic.tsx
@@ -498,7 +498,7 @@ repository:
 
   storage-keyword:
     name: storage.type.tsx
-    match: \b(number|boolean|string|any|var|let|function|const)\b
+    match: \b(number|boolean|string|any|var|let|function|const|module|namespace)\b
 
   paren-expression:
     begin: \(

TypeScriptReact.tmLanguage

@@ -73,7 +73,7 @@
 		<key>await-modifier</key>
 		<dict>
 			<key>match</key>
-			<string>await</string>
+			<string>\bawait\b</string>
 			<key>name</key>
 			<string>storage.modifier.tsx</string>
 		</dict>
@@ -376,7 +376,7 @@
 		<key>expression-operator</key>
 		<dict>
 			<key>match</key>
-			<string>=&gt;|\b(delete|export|import|from|in|instanceof|module|namespace|new|typeof|void|as)\b</string>
+			<string>=&gt;|\b(delete|export|import|from|in|instanceof|new|typeof|void|as)\b</string>
 			<key>name</key>
 			<string>keyword.operator.tsx</string>
 		</dict>
@@ -1607,7 +1607,7 @@
 		<key>storage-keyword</key>
 		<dict>
 			<key>match</key>
-			<string>\b(number|boolean|string|any|var|let|function|const)\b</string>
+			<string>\b(number|boolean|string|any|var|let|function|const|module|namespace)\b</string>
 			<key>name</key>
 			<string>storage.type.tsx</string>
 		</dict>

tests/baselines/namespaceAndModule.txt

@@ -0,0 +1,5 @@
+[1, 1]: source.ts storage.type.ts 
+[2, 1]: source.ts storage.type.ts 
+[3, 9]: source.ts storage.type.ts 
+[4, 9]: source.ts storage.type.ts 
+[5, 9]: source.ts storage.type.ts 

tests/cases/namespaceAndModule.ts

@@ -0,0 +1,5 @@
+^namespace ts { }
+^module ts { }
+declare ^namespace ts {}
+declare ^module ts {}
+declare ^module "x" {}