treat ~ as unary operator, fixes #315 (#317)

Author: AlexHaxe

src/checkstyle/checks/whitespace/OperatorWhitespaceCheck.hx

@@ -11,15 +11,15 @@ class OperatorWhitespaceCheck extends WhitespaceCheckBase {
 
 	// =, +=, -=, *=, /=, <<=, >>=, >>>=, &=, |=, ^=
 	public var assignOpPolicy:WhitespacePolicy;
-	// ++, --, !
+	// ++, --, !, ~
 	public var unaryOpPolicy:WhitespaceUnaryPolicy;
 	// ?:
 	public var ternaryOpPolicy:WhitespacePolicy;
 	// +, -, *, /, %
 	public var arithmeticOpPolicy:WhitespacePolicy;
 	// ==, !=, <, <=, >, >=
 	public var compareOpPolicy:WhitespacePolicy;
-	// ~, &, |, ^, <<, >>, >>>
+	// &, |, ^, <<, >>, >>>
 	public var bitwiseOpPolicy:WhitespacePolicy;
 	// &&, ||
 	public var boolOpPolicy:WhitespacePolicy;
@@ -79,6 +79,7 @@ class OperatorWhitespaceCheck extends WhitespaceCheckBase {
 	function checkUnaryOps(root:TokenTree) {
 		if ((unaryOpPolicy == null) || (unaryOpPolicy == IGNORE)) return;
 		var tokens:Array<TokenTree> = root.filter([
+				Unop(OpNegBits),
 				Unop(OpNot),
 				Unop(OpIncrement),
 				Unop(OpDecrement)

test/checks/whitespace/OperatorWhitespaceCheckTest.hx

@@ -8,7 +8,9 @@ class OperatorWhitespaceCheckTest extends CheckTestCase<OperatorWhitespaceCheckT
 	static inline var MSG_EQUALS_BEFORE:String = 'OperatorWhitespace policy "before" violated by "="';
 	static inline var MSG_EQUALS_AFTER:String = 'OperatorWhitespace policy "after" violated by "="';
 	static inline var MSG_UNARY_NONE:String = 'OperatorWhitespace policy "none" violated by "++"';
+	static inline var MSG_UNARY_NONE_BITWISE:String = 'OperatorWhitespace policy "none" violated by "~"';
 	static inline var MSG_UNARY_INNER:String = 'OperatorWhitespace policy "inner" violated by "++"';
+	static inline var MSG_UNARY_INNER_BITWISE:String = 'OperatorWhitespace policy "inner" violated by "~"';
 	static inline var MSG_INTERVAL_NONE:String = 'OperatorWhitespace policy "none" violated by "..."';
 	static inline var MSG_INTERVAL_AROUND:String = 'OperatorWhitespace policy "around" violated by "..."';
 	static inline var MSG_FUNC_ARG_AROUND:String = 'OperatorWhitespace policy "around" violated by "->"';
@@ -37,6 +39,7 @@ class OperatorWhitespaceCheckTest extends CheckTestCase<OperatorWhitespaceCheckT
 		assertNoMsg(check, OPGT);
 		assertNoMsg(check, MACRO_TYPES);
 		assertNoMsg(check, MACRO_NOT);
+		assertNoMsg(check, BITWISE_NEG);
 	}
 
 	public function testIncorrectOperatorWhitespaceToken() {
@@ -90,10 +93,14 @@ class OperatorWhitespaceCheckTest extends CheckTestCase<OperatorWhitespaceCheckT
 
 		assertNoMsg(check, UNARY_NO_WHITESPACE);
 		assertMsg(check, UNARY_INNER_WHITESPACE, MSG_UNARY_NONE);
+		assertNoMsg(check, BITWISE_NEG);
+		assertMsg(check, BITWISE_NEG_WRONG, MSG_UNARY_NONE_BITWISE);
 
 		check.unaryOpPolicy = INNER;
 		assertMsg(check, UNARY_NO_WHITESPACE, MSG_UNARY_INNER);
 		assertNoMsg(check, UNARY_INNER_WHITESPACE);
+		assertMsg(check, BITWISE_NEG, MSG_UNARY_INNER_BITWISE);
+		assertNoMsg(check, BITWISE_NEG_WRONG);
 	}
 
 	public function testInterval() {
@@ -471,4 +478,18 @@ abstract OperatorWhitespaceCheckTests(String) to String {
 		function test() {
 		}
 	}";
+
+	var BITWISE_NEG = "
+	class Test {
+		function test() {
+			var test = ~test;
+		}
+	}";
+
+	var BITWISE_NEG_WRONG = "
+	class Test {
+		function test() {
+			var test = ~ test;
+		}
+	}";
 }