Merge pull request #297 from HaxeCheckstyle/#296

fixes #296
HaxeCheckstyle · Oct 7, 2016 · 250c295 · 250c295
2 parents 71bddfc + 81a5b39
commit 250c295
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/haxelib.json b/haxelib.json
@@ -16,8 +16,8 @@
 	"contributors": [
 		"adireddy"
 	],
-	"releasenote": "enhancement to RedundantModifier check",
-	"version": "2.1.4",
+	"releasenote": "fix for #296, added SuppressWarnings for SimplifyBooleanExpression check",
+	"version": "2.1.5",
 	"url": "https://github.com/HaxeCheckstyle/haxe-checkstyle",
 	"dependencies": {
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "checkstyle",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Automated code analysis ideal for projects that want to enforce a coding standard.",
   "repository": {
     "type": "git",

diff --git a/src/checkstyle/checks/coding/SimplifyBooleanExpressionCheck.hx b/src/checkstyle/checks/coding/SimplifyBooleanExpressionCheck.hx
@@ -27,6 +27,7 @@ class SimplifyBooleanExpressionCheck extends Check {
 		], ALL);
 
 		for (token in acceptableTokens) {
+			if (isPosSuppressed(token.pos)) continue;
 			if (token.is(Kwd(KwdTrue)) || token.is(Kwd(KwdFalse))) checkToken(token);
 		}
 	}

diff --git a/test/checks/coding/SimplifyBooleanExpressionCheckTest.hx b/test/checks/coding/SimplifyBooleanExpressionCheckTest.hx
@@ -17,6 +17,10 @@ class SimplifyBooleanExpressionCheckTest extends CheckTestCase<SimplifyBooleanEx
 		assertNoMsg(new SimplifyBooleanExpressionCheck(), TEST5);
 		assertNoMsg(new SimplifyBooleanExpressionCheck(), TEST6);
 	}
+
+	public function testSupressExpression() {
+		assertNoMsg(new SimplifyBooleanExpressionCheck(), TEST7);
+	}
 }
 
 @:enum
@@ -68,4 +72,13 @@ abstract SimplifyBooleanExpressionCheckTests(String) to String {
 			if (!bvar) {}
 		}
 	}";
+
+	var TEST7 = "
+	abstractAndClass Test {
+		@SuppressWarnings('checkstyle:SimplifyBooleanExpression')
+		public static function main() {
+			var value: Null<Bool> = null;
+			trace(value == true);
+		}
+	}";
 }