Merge pull request #21 from deresmos/feature/add_while_statement

Support While statement

Author: Kazuma Arimura

domain/vbscript.go

@@ -9,6 +9,8 @@ const (
 	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 )`
+	VBScriptWhileEndPattern    = `(?i)^(\s*?)(\t*?)(End While|Wend)`
 	VBScriptFunctionPattern    = `(?i)^(\s*?)(\t*?)(Private |Public (Default )?)?(Function|Sub)`
 	VBScriptEndFunctionPattern = `(?i)^(\s*?)(\t*?)(End (Function|Sub))`
 )

internal/process_control.go

@@ -75,7 +75,12 @@ func isBeginNestStatement(str string) bool {
 		fmt.Printf("err: %v", err)
 	}
 
-	return isIf || isFor || isDo
+	isWhile, err := regexp.MatchString(domain.VBScriptWhilePattern, str)
+	if err != nil {
+		fmt.Printf("err: %v", err)
+	}
+
+	return isIf || isFor || isDo || isWhile
 }
 
 func isEndNestStatement(str string) bool {
@@ -94,7 +99,12 @@ func isEndNestStatement(str string) bool {
 		fmt.Printf("err: %v", err)
 	}
 
-	return isEndIf || isNext || isLoop
+	isWhileEnd, err := regexp.MatchString(domain.VBScriptWhileEndPattern, str)
+	if err != nil {
+		fmt.Printf("err: %v", err)
+	}
+
+	return isEndIf || isNext || isLoop || isWhileEnd
 }
 
 func isIncrementStatement(str string) bool {

test/testdata/while/while.vbs

@@ -0,0 +1,3 @@
+While i <= 10 ' +1
+    i += 1
+End While

test/testdata/while/while_multi.vbs

@@ -0,0 +1,7 @@
+While i <= 10 ' +1
+    i += 1
+End While
+
+While i <= 10 ' +1
+    i += 1
+End While

test/testdata/while/while_nest.vbs

@@ -0,0 +1,6 @@
+While i <= 10 ' +1
+    While j <= 10 ' +2
+        j += 1
+    End While
+    i += 1
+End While

test/testdata/while/while_triple_nest.vbs

@@ -0,0 +1,9 @@
+While i <= 10 ' +1
+    While j <= 10 ' +2
+        While k <= 10 ' +3
+            k += 1
+        End While
+        j += 1
+    End While
+    i += 1
+End While

test/testdata/while/while_wend.vbs

@@ -0,0 +1,7 @@
+While i <= 10 ' +1
+    i += 1
+Wend
+
+While i <= 10 ' +1
+    i += 1
+End While

test/while_statements_test.go

@@ -0,0 +1,29 @@
+package test_test
+
+import (
+	"testing"
+
+	"github.com/st-tech/refactoring-conductor/domain"
+	"github.com/st-tech/refactoring-conductor/internal"
+)
+
+func TestWhileStatements(t *testing.T) {
+	tests := []struct {
+		filename      string
+		expectedValue int
+	}{
+		{"testdata/while/while.vbs", 1},
+		{"testdata/while/while_nest.vbs", 3},
+		{"testdata/while/while_triple_nest.vbs", 6},
+		{"testdata/while/while_multi.vbs", 2},
+		{"testdata/while/while_wend.vbs", 2},
+	}
+	for _, test := range tests {
+		vbscript := domain.VBScript{}
+		internal.Read(test.filename, &vbscript)
+
+		if test.expectedValue != vbscript.CognitiveComplexity {
+			t.Errorf("wrong cognitive complexity output: got %v, expected %v (%s)", vbscript.CognitiveComplexity, test.expectedValue, test.filename)
+		}
+	}
+}