moved check for empty blocks to new EmptyBlockCheck

Author: AlexHaxe

README.md

@@ -79,6 +79,13 @@ More information in [wiki page](https://github.com/adireddy/haxe-checkstyle/wiki
 				"severity": "INFO"
 			}
 		},
+		{
+			"type": "EmptyBlock",
+			"props": {
+				"severity": "ERROR",
+				"option": "empty",
+				"tokens": []
+			}
 		{
 			"type": "EmptyLines",
 			"props": {

checkstyle/checks/EmptyBlockCheck.hx

@@ -0,0 +1,66 @@
+package checkstyle.checks;
+
+import checkstyle.LintMessage.SeverityLevel;
+import haxe.macro.Expr;
+
+@name("EmptyBlock")
+@desc("Checks empty blocks / object declarations")
+class EmptyBlockCheck extends Check {
+
+	public static inline var BLOCK:String = "BLOCK";
+	public static inline var OBJECT_DECL:String = "OBJECT_DECL";
+
+	// require comment in empty block / object decl
+	public static inline var TEXT:String = "text";
+	// empty block / object decl can be empty or have comments
+	// if block has no comments, enforces {} notation
+	public static inline var EMPTY:String = "empty";
+
+	public var tokens:Array<String>;
+	public var option:String;
+
+	public function new() {
+		super();
+		tokens = [];
+		option = EMPTY;
+	}
+
+	function hasToken(token:String):Bool {
+		if (tokens.length == 0) return true;
+		if (tokens.indexOf(token) > -1) return true;
+		return false;
+	}
+
+	override function actualRun() {
+		ExprUtils.walkFile(checker.ast, function(e) {
+			if (isPosSuppressed(e.pos)) return;
+			switch(e.expr){
+				case EBlock([]):
+					if (!hasToken(BLOCK)) return;
+					checkEmptyBlock(e);
+				case EObjectDecl([]):
+					if (!hasToken(OBJECT_DECL)) return;
+					checkEmptyBlock(e);
+				default:
+			}
+		});
+	}
+
+	function checkEmptyBlock(e:Expr) {
+		if ((e == null) || (e.expr == null)) return;
+
+		var block:String = checker.file.content.substring(e.pos.min, e.pos.max);
+		var containsOnlyWS:Bool = (~/\{\s+\}/m.match(block));
+		var containsText:Bool = (~/\{\s*\S.*\S\s*\}/m.match(block));
+
+		if (option == TEXT) {
+			if (!containsText) {
+				logPos("Empty block should contain a comment", e.pos, Reflect.field(SeverityLevel, severity));
+			}
+			return;
+		}
+		if (containsOnlyWS) {
+			logPos("Empty block should be written as {}", e.pos, Reflect.field(SeverityLevel, severity));
+		}
+	}
+}

checkstyle/checks/LeftCurlyCheck.hx

@@ -176,8 +176,6 @@ class LeftCurlyCheck extends Check {
 		if ((e == null) || (e.expr == null)) return;
 
 		switch(e.expr) {
-			case EBlock([]):
-				checkEmptyBlock(e);
 			case EBlock(_):
 				var linePos:LinePos = checker.getLinePos(e.pos.min);
 				var line:String = checker.lines[linePos.line];
@@ -196,26 +194,6 @@ class LeftCurlyCheck extends Check {
 		checkLeftCurly(line, pos);
 	}
 
-	function checkEmptyBlock(e:Expr) {
-		if ((e == null) || (e.expr == null)) return;
-
-		var lineMin:Int = checker.getLinePos(e.pos.min).line;
-		var lineMax:Int = checker.getLinePos(e.pos.max).line;
-		if (lineMin != lineMax) {
-			var block:String = "";
-			for (lineIndex in lineMin...(lineMax + 1)) {
-				block += StringTools.trim(checker.lines[lineIndex]);
-			}
-			if (~/.*\{\}($|[ \t]*\/\/.*$)/.match(block)) {
-				logPos("Empty block should be written as {}", e.pos, Reflect.field(SeverityLevel, severity));
-			}
-		}
-
-		var linePos:LinePos = checker.getLinePos(e.pos.min);
-		var line:String = checker.lines[linePos.line];
-		checkLeftCurly(line, e.pos);
-	}
-
 	@SuppressWarnings("checkstyle:BlockFormat")
 	function checkLeftCurly(line:String, pos:Position) {
 		var lineLength:Int = line.length;

resources/config.json

@@ -56,6 +56,14 @@
 				"severity": "INFO"
 			}
 		},
+		{
+			"type": "EmptyBlock",
+			"props": {
+				"severity": "ERROR",
+				"option": "empty",
+				"tokens": []
+			}
+		},
 		{
 			"type": "EmptyLines",
 			"props": {