Merge branch 'main' into feature/add_while_statement

Author: deresmos

domain/vbscript.go

@@ -6,7 +6,7 @@ const (
 	VBScriptElsePattern        = `(?i)^(\s*?)(\t*?)(Else|ElseIf)`
 	VBScriptEndIfPattern       = `(?i)^(\s*?)(\t*?)(End if)`
 	VBScriptForPattern         = `(?i)^(\s*?)(\t*?)(For )`
-	VBScriptNextPattern        = `(?i)^(\s*?)(\t*?)(Next)($|(\s+?)(\t+?))`
+	VBScriptNextPattern        = `(?i)^(\s*?)(\t*?)(Next)($|(\s+?)|(\t+?))`
 	VBScriptDoPattern          = `(?i)^(\s*?)(\t*?)(Do)($|(\s+?)|(\t+?)| While | Until )`
 	VBScriptLoopPattern        = `(?i)^(\s*?)(\t*?)(Loop)($|(\s+?)|(\t+?)| While | Until )`
 	VBScriptWhilePattern       = `(?i)^(\s*?)(\t*?)(While )`

test/for_statements_test.go

@@ -16,6 +16,7 @@ func TestForStatements(t *testing.T) {
 		{"testdata/for/for_multi.vbs", 2},
 		{"testdata/for/for_nest.vbs", 3},
 		{"testdata/for/for_triple_nest.vbs", 6},
+		{"testdata/for/for_whitespace.vbs", 2},
 	}
 	for _, test := range tests {
 		vbscript := domain.VBScript{}

test/testdata/for/for_whitespace.vbs

@@ -0,0 +1,7 @@
+For i = 1 To 10 ' +1
+    nextTest = i
+Next ' whitespace check
+
+For i = 1 To 10 ' +1
+    Min = i
+Next