Merge pull request #76 from Microsoft/fixNamespaceAndModule

Changes scope for namespace/module to storage.type

Author: rbuckton

TypeScript.YAML-tmLanguage

@@ -487,7 +487,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
@@ -507,7 +507,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

@@ -475,7 +475,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
@@ -495,7 +495,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

@@ -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" {}