Merge pull request #2 from adireddy/dev

added ignoreRangeOperator for SpacingCheck

checkstyle/checks/SpacingCheck.hx

@@ -15,6 +15,7 @@ class SpacingCheck extends Check {
 	public var spaceAroundBinop = true;
 	public var noSpaceAroundUnop = true;
 	public var spaceIfCondition = true;
+	public var ignoreRangeOperator = true;
 
 	override function _actualRun() {
 		var lastExpr = null;
@@ -27,6 +28,7 @@ class SpacingCheck extends Check {
 
 			switch e.expr {
 				case EBinop(bo, l, r) if (spaceAroundBinop):
+					if (ignoreRangeOperator && binopString(bo) == "...") return;
 					if (r.pos.min - l.pos.max < binopSize(bo) + 2) logPos('No space around ${binopString(bo)}', e.pos, Reflect.field(SeverityLevel, severity));
 				case EUnop(uo, post, e2) if (noSpaceAroundUnop):
 					var dist = 0;

haxelib.json

@@ -10,8 +10,8 @@
 	],
 	"description": "Automated code analysis ideal for projects that want to enforce a coding standard.",
 	"contributors": ["adireddy"],
-	"releasenote": "added type check",
-	"version": "1.0.4",
+	"releasenote": "added ignoreRangeOperator config for SpacingCheck",
+	"version": "1.0.5",
 	"url": "https://github.com/adireddy/haxe-checkstyle",
 	"dependencies": {
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "checkstyle",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"description": "Automated code analysis ideal for projects that want to enforce a coding standard.",
 	"repository": {
 		"type": "git",
@@ -31,4 +31,4 @@
 		"grunt-zip": "^0.16.0",
 		"jsdoc": "^3.2.2"
 	}
-}
+}

resources/config.json

@@ -96,7 +96,8 @@
 				"severity": "INFO",
 				"spaceIfCondition": true,
 				"spaceAroundBinop": true,
-				"spaceAroundBinop": true
+				"spaceAroundBinop": true,
+				"ignoreRangeOperator": true
 			}
 		},
 		{

test/IndentationCharacterCheckTest.hx

@@ -21,6 +21,11 @@ class IndentationCharacterCheckTest extends CheckTestCase {
 		var msg = checkMessage(IndentationTests.TEST3, check);
 		assertEquals(msg, 'Wrong indentation character (space)');
 	}
+
+	public function testMultilineIfIndentation() {
+		var msg = checkMessage(IndentationTests.TEST4, new IndentationCharacterCheck());
+		assertEquals(msg, '');
+	}
 }
 
 class IndentationTests {
@@ -40,4 +45,14 @@ class IndentationTests {
 	"class Test {
 		public function new() {}
 	}";
+
+	public static inline var TEST4:String =
+	"class Test {
+		public function new() {
+			if (actionType == 'STREET' ||
+				(actionType == 'BASKET' && ( actionNumber == 2 || actionNumber == 4) )) {
+				return BetAreaModel.STREET;
+			}
+		}
+	}";
 }

test/SpacingCheckTest.hx

@@ -18,6 +18,11 @@ class SpacingCheckTest extends CheckTestCase {
 		var msg = checkMessage(SpacingTests.TEST3, new SpacingCheck());
 		assertEquals(msg, 'Space around ++');
 	}
+
+	public function testFor() {
+		var msg = checkMessage(SpacingTests.TEST4, new SpacingCheck());
+		assertEquals(msg, '');
+	}
 }
 
 class SpacingTests {
@@ -36,9 +41,18 @@ class SpacingTests {
 	}";
 
 	public static inline var TEST3:String =
-	"class Test {
+"class Test {
 		public function test() {
 			var a = a ++;
 		}
 	}";
+
+	public static inline var TEST4:String =
+	"class Test {
+		public function test() {
+			for(i in 0...10) {
+			
+			}
+		}
+	}";
 }