syntax: highlight With, For, Each, In

fix #21

Author: Lukas Neubert

syntaxes/tests/other.bas

@@ -1,20 +1,27 @@
 ' SYNTAX TEST "source.vba" "main syntax test"
+Attribute VB_Name = "SyntaxTest"
+' <--------- keyword.Attribute.vba
 
-  Attribute VB_Name = "SyntaxTest"
-' ^^^^^^^^^ keyword.Attribute.vba
+Public Const FOO As Integer = 1
+' <------ storage.modifier.visibility
+'      ^^^^^ keyword.Const.vba
+'                ^^ keyword.As.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
+Dim obj As Object
+' <--- keyword.Dim.vba
+Set obj = Nothing
+' <--- keyword.Set.vba
+'         ^^^^^^^ keyword.Nothing.vba
 Set obj = New Object
 '         ^^^ keyword.New.vba
+
+With presentation
+' <---- keyword.control.With.vba
+    For Each slide In .Slides
+'   ^^^ keyword.control.For.vba
+'       ^^^^ keyword.control.Each.vba
+    Next ' Some comment
+'   ^^^^ keyword.control.Next.vba
+'        ^^^^^^^^^^^^^^ comment.line.quote
+End With
+' <-------- keyword.control.End.vba

syntaxes/tests/procedure.bas

@@ -3,17 +3,15 @@
   Private Sub doStuff(x As String)
 ' ^^^^^^^ storage.modifier.visibility
 '         ^^^ keyword.Sub.vba
-  End Sub
-' ^^^ keyword.End.vba
-'     ^^^ keyword.Sub.vba
+End Sub
+' <------- keyword.End.vba
 
   Function foo() As Boolean
 ' ^^^^^^^^ keyword.Function.vba
 '                ^^ keyword.As.vba
 '                   ^^^^^^^ support.type.Boolean
-  End Function
-' ^^^ keyword.End.vba
-'     ^^^^^^^^ keyword.Function.vba
+End Function
+' <------------ keyword.End.vba
 
 Function withParam(Optional p1 As MyType)
 '                  ^^^^^^^^ storage.modifier.visibility

syntaxes/vba.tmLanguage.json

@@ -24,7 +24,19 @@
 			"patterns": [
 				{
 					"name": "keyword.$1.vba",
-					"match": "\\b(As|Attribute|Const|Dim|Function|New|Nothing|Set|Sub|End)\\b"
+					"match": "\\b(As|Attribute|Const|Dim|Function|New|Nothing|Set|Sub)\\b"
+				},
+				{
+					"name": "keyword.End.vba",
+					"match": "\\bEnd (Sub|Function)\\b"
+				},
+				{
+					"name": "keyword.control.$1.vba",
+					"match": "\\b(Each|For|In|Next|With)\\b"
+				},
+				{
+					"name": "keyword.control.End.vba",
+					"match": "\\bEnd (With)\\b"
 				}
 			]
 		},