Fix missing expression cuddle check

testdata/src/default_config/generic_handling.go

@@ -592,3 +592,16 @@ func AnonymousFunc() {
 		return nil // want "return statements should not be cuddled if block has more than two lines"
 	}())
 }
+
+// Issue #153
+func ExpressionForBlock() {
+	for i := 0; i < 4; i++ {
+		fmt.Println()
+	}
+	Up(3) // want "expressions should not be cuddled with blocks"
+
+	if autoheight != 3 {
+		t.Errorf("height should be 3 but is %d", autoheight)
+	}
+	Down(3) // want "expressions should not be cuddled with blocks"
+}

testdata/src/default_config/generic_handling.go.golden

@@ -639,3 +639,18 @@ func AnonymousFunc() {
 		return nil // want "return statements should not be cuddled if block has more than two lines"
 	}())
 }
+
+// Issue #153
+func ExpressionForBlock() {
+	for i := 0; i < 4; i++ {
+		fmt.Println()
+	}
+
+	Up(3) // want "expressions should not be cuddled with blocks"
+
+	if autoheight != 3 {
+		t.Errorf("height should be 3 but is %d", autoheight)
+	}
+
+	Down(3) // want "expressions should not be cuddled with blocks"
+}

wsl.go

@@ -583,7 +583,7 @@ func (p *processor) parseBlockStatements(statements []ast.Stmt) {
 				}
 
 				p.addWhitespaceBeforeError(t, reasonExpressionCuddledWithDeclOrRet)
-			case *ast.IfStmt, *ast.RangeStmt, *ast.SwitchStmt:
+			case *ast.IfStmt, *ast.RangeStmt, *ast.SwitchStmt, *ast.TypeSwitchStmt, *ast.ForStmt:
 				p.addWhitespaceBeforeError(t, reasonExpressionCuddledWithBlock)
 			}