various syntax highlighting fixes (#27)

* Optional

* string literal and some updates to other tests

* Dim, Const, Set, New, Nothing

Author: Lukas Neubert

syntaxes/tests/main.bas

@@ -1,20 +1,24 @@
 ' SYNTAX TEST "source.vba" "numbers"
 
 Dim dec As Decimal
+'          ^^^^^^^ support.type.Decimal
 dec = 2.375D
 '     ^^^^^^ constant.numeric.decimal
 dec = 4.000
 '     ^^^^^ constant.numeric.decimal
 
 Dim doub As Double
-doub= 4.0R
-'     ^^^^ constant.numeric.decimal
+'           ^^^^^^ support.type.Double
+doub = 4.0R
+'      ^^^^ constant.numeric.decimal
 
 Dim sing As Single
+'           ^^^^^^ support.type.Single
 sing = 4.2F
 '      ^^^^ constant.numeric.decimal
 
 Dim i As Integer
+'        ^^^^^^^ support.type.Integer
 i = 123
 '   ^^^ constant.numeric.integer
 i = 1_000_000

syntaxes/tests/numbers.bas

@@ -0,0 +1,20 @@
+' SYNTAX TEST "source.vba" "main syntax test"
+
+  Attribute VB_Name = "SyntaxTest"
+' ^^^^^^^^^ keyword.Attribute.vba
+
+  Public Const FOO As Integer = 1
+' ^^^^^^ storage.modifier.visibility
+'        ^^^^^ keyword.Const.vba
+'                  ^^ keyword.As.vba
+
+  ' some comment
+' ^^^^^^^^^^^^^^ comment.line.quote
+
+  Dim obj As Object
+' ^^^ keyword.Dim.vba
+  Set obj = Nothing
+' ^^^ keyword.Set.vba
+'           ^^^^^^^ keyword.Nothing.vba
+Set obj = New Object
+'         ^^^ keyword.New.vba

syntaxes/tests/other.bas

@@ -0,0 +1,22 @@
+' SYNTAX TEST "source.vba" "Sub, Function and anything related"
+
+  Private Sub doStuff(x As String)
+' ^^^^^^^ storage.modifier.visibility
+'         ^^^ keyword.Sub.vba
+  End Sub
+' ^^^ keyword.End.vba
+'     ^^^ keyword.Sub.vba
+
+  Function foo() As Boolean
+' ^^^^^^^^ keyword.Function.vba
+'                ^^ keyword.As.vba
+'                   ^^^^^^^ support.type.Boolean
+  End Function
+' ^^^ keyword.End.vba
+'     ^^^^^^^^ keyword.Function.vba
+
+Function withParam(Optional p1 As MyType)
+'                  ^^^^^^^^ storage.modifier.visibility
+End Function
+
+Call Mod.mSub()

syntaxes/tests/procedure.bas

@@ -0,0 +1,6 @@
+' SYNTAX TEST "source.vba" "Strings"
+
+Dim str As String
+'          ^^^^^^ support.type.String
+str = "Hello"
+'     ^^^^^^^ string.quoted

syntaxes/tests/string.bas

@@ -10,6 +10,7 @@
 		{ "include": "#keywords" },
 		{ "include": "#numbers" },
 		{ "include": "#option" },
+		{ "include": "#strings" },
 		{ "include": "#types" },
 		{ "include": "#visibility" }
 	],
@@ -23,7 +24,7 @@
 			"patterns": [
 				{
 					"name": "keyword.$1.vba",
-					"match": "\\b(As|Attribute|Function|Sub|End)\\b"
+					"match": "\\b(As|Attribute|Const|Dim|Function|New|Nothing|Set|Sub|End)\\b"
 				}
 			]
 		},
@@ -43,13 +44,18 @@
 			"name": "storage.modifier.option",
 			"match": "\\b(Option (Explicit|Private Module|Base|(Compare (Binary|Text)+))?)\\b"
 		},
+		"strings": {
+			"name": "string.quoted",
+			"begin": "\"",
+			"end": "\""
+		},
 		"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"
+			"match": "\\b(Public|Private|Optional)\\b"
 		}
 	}
 }