Change spacing settings for switch and catch to Directive

Author: RealyUniqueName

resources/default-config.json

@@ -447,8 +447,8 @@
 				"spaceForLoop": "should",
 				"ignoreRangeOperator": true,
 				"spaceWhileLoop": "should",
-				"spaceCatch": true,
-				"spaceSwitchCase": true,
+				"spaceCatch": "should",
+				"spaceSwitchCase": "should",
 				"noSpaceAroundUnop": true
 			},
 			"type": "Spacing"

src/checkstyle/checks/whitespace/SpacingCheck.hx

@@ -16,8 +16,8 @@ class SpacingCheck extends Check {
 	public var spaceIfCondition:Directive;
 	public var spaceForLoop:Directive;
 	public var spaceWhileLoop:Directive;
-	public var spaceSwitchCase:Bool;
-	public var spaceCatch:Bool;
+	public var spaceSwitchCase:Directive;
+	public var spaceCatch:Directive;
 	public var ignoreRangeOperator:Bool;
 
 	public function new() {
@@ -27,8 +27,8 @@ class SpacingCheck extends Check {
 		spaceIfCondition = SHOULD;
 		spaceForLoop = SHOULD;
 		spaceWhileLoop = SHOULD;
-		spaceSwitchCase = true;
-		spaceCatch = true;
+		spaceSwitchCase = SHOULD;
+		spaceCatch = SHOULD;
 		ignoreRangeOperator = true;
 		categories = [Category.STYLE, Category.CLARITY];
 	}
@@ -68,12 +68,12 @@ class SpacingCheck extends Check {
 					checkSpaceBetweenExpressions("for", e, it, spaceForLoop);
 				case EWhile(econd, _, true):
 					checkSpaceBetweenExpressions("while", e, econd, spaceWhileLoop);
-				case ESwitch(eswitch, _, _) if (spaceSwitchCase):
-					checkSpaceBetweenManually("switch", lastExpr, eswitch);
-				case ETry(etry, catches) if (spaceCatch):
+				case ESwitch(eswitch, _, _):
+					checkSpaceBetweenManually("switch", lastExpr, eswitch, spaceSwitchCase);
+				case ETry(etry, catches):
 					var exprBeforeCatch = lastExpr;
 					for (ctch in catches) {
-						checkSpaceBetweenManually("catch", exprBeforeCatch, ctch.expr);
+						checkSpaceBetweenManually("catch", exprBeforeCatch, ctch.expr, spaceCatch);
 						exprBeforeCatch = ctch.expr;
 					}
 				default:
@@ -99,7 +99,7 @@ class SpacingCheck extends Check {
 		return (new Printer()).printUnop(uo);
 	}
 
-	function checkSpaceBetweenExpressions(name:String, e1:Expr, e2:Expr, directive:Directive = SHOULD) {
+	function checkSpaceBetweenExpressions(name:String, e1:Expr, e2:Expr, directive:Directive) {
 		switch (directive) {
 			case ANY:
 			case SHOULD_NOT:
@@ -113,12 +113,21 @@ class SpacingCheck extends Check {
 		}
 	}
 
-	function checkSpaceBetweenManually(name:String, before:Expr, check:Expr) {
+	function checkSpaceBetweenManually(name:String, before:Expr, check:Expr, directive:Directive) {
 		var prevExprUntilChecked = checker.file.content.substring(before.pos.min, check.pos.min + 1);
 		var checkPos = prevExprUntilChecked.lastIndexOf('$name(');
-		if (checkPos > -1) {
-			var fileCheckPos = before.pos.min + checkPos;
-			logRange('No space between "$name" and "("', fileCheckPos, fileCheckPos + '$name('.length);
+		var fileCheckPos = before.pos.min + checkPos;
+
+		switch (directive) {
+			case ANY:
+			case SHOULD_NOT:
+				if (checkPos < 0) {
+					logRange('Space between "$name" and "("', fileCheckPos, fileCheckPos + '$name ('.length);
+				}
+			case SHOULD:
+				if (checkPos > -1) {
+					logRange('No space between "$name" and "("', fileCheckPos, fileCheckPos + '$name('.length);
+				}
 		}
 	}
 }

test/checks/whitespace/SpacingCheckTest.hx

@@ -52,15 +52,31 @@ class SpacingCheckTest extends CheckTestCase<SpacingCheckTests> {
 		assertNoMsg(check, TEST5A);
 	}
 
-	public function testSwitch() {
+	public function testSwitchShouldContainSpace() {
 		assertMsg(new SpacingCheck(), TEST6A, 'No space between "switch" and "("');
 		assertNoMsg(new SpacingCheck(), TEST6B);
 	}
 
-	public function testCatch() {
+	public function testSwitchShouldNotContainSpace() {
+		var check = new SpacingCheck();
+		check.spaceSwitchCase = Directive.SHOULD_NOT;
+
+		assertMsg(check, TEST6B, 'Space between "switch" and "("');
+		assertNoMsg(check, TEST6A);
+	}
+
+	public function testCatchShouldContainSpace() {
 		assertMsg(new SpacingCheck(), TEST7A, 'No space between "catch" and "("');
 		assertNoMsg(new SpacingCheck(), TEST7B);
 	}
+
+	public function testCatchShouldNotContainSpace() {
+		var check = new SpacingCheck();
+		check.spaceCatch = Directive.SHOULD_NOT;
+
+		assertMsg(check, TEST7B, 'Space between "catch" and "("');
+		assertNoMsg(check, TEST7A);
+	}
 }
 
 @:enum