Merge pull request #22 from deresmos/feature/add_case_statement

Support Select Case statement

Author: sattosan

domain/vbscript.go

@@ -11,6 +11,8 @@ const (
 	VBScriptLoopPattern        = `(?i)^(\s*?)(\t*?)(Loop)($|(\s+?)|(\t+?)| While | Until )`
 	VBScriptWhilePattern       = `(?i)^(\s*?)(\t*?)(While )`
 	VBScriptWhileEndPattern    = `(?i)^(\s*?)(\t*?)(End While|Wend)`
+	VBScriptSelectPattern      = `(?i)^(\s*?)(\t*?)(Select Case )`
+	VBScriptEndSelectPattern   = `(?i)^(\s*?)(\t*?)(End Select)($|(\s+?)|(\t+?))`
 	VBScriptFunctionPattern    = `(?i)^(\s*?)(\t*?)(Private |Public (Default )?)?(Function|Sub)`
 	VBScriptEndFunctionPattern = `(?i)^(\s*?)(\t*?)(End (Function|Sub))`
 )

internal/process_control.go

@@ -80,7 +80,12 @@ func isBeginNestStatement(str string) bool {
 		fmt.Printf("err: %v", err)
 	}
 
-	return isIf || isFor || isDo || isWhile
+	isSelect, err := regexp.MatchString(domain.VBScriptSelectPattern, str)
+	if err != nil {
+		fmt.Printf("err: %v", err)
+	}
+
+	return isIf || isFor || isDo || isWhile || isSelect
 }
 
 func isEndNestStatement(str string) bool {
@@ -104,7 +109,12 @@ func isEndNestStatement(str string) bool {
 		fmt.Printf("err: %v", err)
 	}
 
-	return isEndIf || isNext || isLoop || isWhileEnd
+	isEndSelect, err := regexp.MatchString(domain.VBScriptEndSelectPattern, str)
+	if err != nil {
+		fmt.Printf("err: %v", err)
+	}
+
+	return isEndIf || isNext || isLoop || isWhileEnd || isEndSelect
 }
 
 func isIncrementStatement(str string) bool {

test/select_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 TestSelectStatements(t *testing.T) {
+	tests := []struct {
+		filename      string
+		expectedValue int
+	}{
+		{"testdata/select/select.vbs", 1},
+		{"testdata/select/select_multi.vbs", 2},
+		{"testdata/select/select_nest.vbs", 3},
+		{"testdata/select/select_triple_nest.vbs", 6},
+		{"testdata/select/select_whitespace.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)
+		}
+	}
+}

test/testdata/select/select.vbs

@@ -0,0 +1,6 @@
+Select Case number ' +1
+    Case 1
+        i = 1
+    Case Else
+        i = 0
+End Select

test/testdata/select/select_multi.vbs

@@ -0,0 +1,13 @@
+Select Case number ' +1
+    Case 1
+        i = 1
+    Case Else
+        i = 0
+End Select
+
+Select Case number ' +1
+    Case 1
+        i = 1
+    Case Else
+        i = 0
+End Select

test/testdata/select/select_nest.vbs

@@ -0,0 +1,12 @@
+Select Case number ' +1
+    Case 1
+        Select Case number ' +2
+            Case 1
+                i = 1
+            Case Else
+                i = 0
+        End Select
+        i = 1
+    Case Else
+        i = 0
+End Select

test/testdata/select/select_triple_nest.vbs

@@ -0,0 +1,17 @@
+Select Case number ' +1
+    Case 1
+        Select Case number ' +2
+            Case 1
+                Select Case number ' +3
+                    Case 1
+                        i = 1
+                    Case Else
+                        i = 0
+                End Select
+            Case Else
+                i = 0
+        End Select
+        i = 1
+    Case Else
+        i = 0
+End Select

test/testdata/select/select_whitespace.vbs

@@ -0,0 +1,13 @@
+Select Case number ' +1
+    Case 1
+        i = 1
+    Case Else
+        i = 0
+End Select ' whitespace check
+
+Select Case number ' +1
+    Case 1
+        i = 1
+    Case Else
+        i = 0
+End Select