syntax: hitghlight types and As

fix #10, fix #11

Author: Lukas Neubert

syntaxes/tests/main.bas

@@ -1,23 +1,27 @@
 ' SYNTAX TEST "source.vba" "main syntax test"
 
   Attribute VB_Name = "SyntaxTest"
-' ^^^^^^^^^ keyword.attribute
+' ^^^^^^^^^ keyword.Attribute.vba
 
-  Public Const FOO As Int = 1
+  Public Const FOO As Integer = 1
 ' ^^^^^^ storage.modifier.visibility
+'                  ^^ keyword.As.vba
+'                     ^^^^^^^ support.type.Integer
 
   ' some comment
-' ^^^^^^^^^^^^^^ comment.line
+' ^^^^^^^^^^^^^^ comment.line.quote
 
   Private Sub doStuff()
 ' ^^^^^^^ storage.modifier.visibility
-'         ^^^ keyword.procedure
+'         ^^^ keyword.Sub.vba
   End Sub
-' ^^^ keyword.other
-'     ^^^ keyword.procedure
+' ^^^ keyword.End.vba
+'     ^^^ keyword.Sub.vba
 
-  Function foobar()
-' ^^^^^^^^ keyword.procedure
+  Function foobar() As Boolean
+' ^^^^^^^^ keyword.Function.vba
+'                   ^^ keyword.As.vba
+'                      ^^^^^^^ support.type.Boolean
   End Function
-' ^^^ keyword.other
-'     ^^^^^^^^ keyword.procedure
+' ^^^ keyword.End.vba
+'     ^^^^^^^^ keyword.Function.vba

syntaxes/vba.tmLanguage.json

@@ -7,36 +7,33 @@
 	],
 	"patterns": [
 		{ "include": "#comments" },
-		{ "include": "#visibility" },
+		{ "include": "#keywords" },
 		{ "include": "#option" },
-		{ "include": "#keywords" }
+		{ "include": "#types" },
+		{ "include": "#visibility" }
 	],
 	"repository": {
 		"comments": {
-			"name": "comment.line",
+			"name": "comment.line.quote",
 			"begin": "'",
 			"end": "$"
 		},
 		"keywords": {
 			"patterns": [
 				{
-					"name": "keyword.attribute",
-					"match": "\\b(Attribute)\\b"
-				},
-				{
-					"name": "keyword.procedure",
-					"match": "\\b(Function|Sub)\\b"
-				},
-				{
-					"name": "keyword.other",
-					"match": "\\b(End)\\b"
+					"name": "keyword.$1.vba",
+					"match": "\\b(As|Attribute|Function|Sub|End)\\b"
 				}
 			]
 		},
 		"option": {
 			"name": "storage.modifier.option",
 			"match": "\\b(Option (Explicit|Private Module|Base|(Compare (Binary|Text)+))?)\\b"
 		},
+		"types": {
+			"name": "support.type.$1",
+			"match": "\\b(Boolean|Byte|Char|Date|Decimal|Double|Integer|Long|Object|SByte|Short|Single|String|UInteger|ULong|UShort)\\b"
+		},
 		"visibility": {
 			"name": "storage.modifier.visibility",
 			"match": "\\b(Public|Private)\\b"