Merge branch 'dev'

Author: adireddy

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"
+			}
+		},
 		{
 			"type": "EmptyLines",
 			"props": {
@@ -112,6 +119,29 @@ More information in [wiki page](https://github.com/adireddy/haxe-checkstyle/wiki
 				"character": "tab"
 			}
 		},
+		{
+			"type": "LeftCurly",
+			"props": {
+				"severity": "WARNING",
+				"option": "eol",
+				"tokens": [
+					"CLASS_DEF",
+					"ENUM_DEF",
+					"ABSTRACT_DEF",
+					"TYPEDEF_DEF",
+					"CLASS_DEF",
+					"INTERFACE_DEF",
+					"OBJECT_DECL",
+					"FUNCTION",
+					"FOR",
+					"IF",
+					"WHILE",
+					"SWITCH",
+					"TRY",
+					"CATCH"
+				]
+			}
+		},
 		{
 			"type": "LineLength",
 			"props": {
@@ -131,6 +161,13 @@ More information in [wiki page](https://github.com/adireddy/haxe-checkstyle/wiki
 				]
 			}
 		},
+		{
+			"type": "LocalVariableName",
+			"props": {
+				"severity": "ERROR",
+				"format": "^[a-z]+[a-zA-Z0-9]*$"
+			}
+		},
 		{
 			"type": "MemberName",
 			"props": {
@@ -168,6 +205,14 @@ More information in [wiki page](https://github.com/adireddy/haxe-checkstyle/wiki
 				"tokens": []
 			}
 		},
+		{
+			"type": "NeedBraces",
+			"props": {
+				"severity": "WARNING",
+				"allowSingleLineStatement": true,
+				"tokens": []
+			}
+		},
 		{
 			"type": "NestedForDepth",
 			"props": {

checkstyle/Checker.hx

@@ -121,15 +121,17 @@ class Checker {
 			makeAST();
 		}
 		catch (e:Dynamic) {
-			for (reporter in reporters) reporter.addMessage({
-				fileName:file.name,
-				message: "Parsing failed: " + e + "\nStacktrace: " +
-							CallStack.toString(CallStack.exceptionStack()),
-				line:1,
-				column:1,
-				severity:ERROR,
-				moduleName:"Checker"
-			});
+			for (reporter in reporters) {
+				reporter.addMessage({
+					fileName:file.name,
+					message: "Parsing failed: " + e + "\nStacktrace: " +
+								CallStack.toString(CallStack.exceptionStack()),
+					line:1,
+					column:1,
+					severity:ERROR,
+					moduleName:"Checker"
+				});
+			}
 			for (reporter in reporters) reporter.fileFinish(file);
 			return;
 		}
@@ -141,15 +143,17 @@ class Checker {
 				for (reporter in reporters) for (m in messages) reporter.addMessage(m);
 			}
 			catch (e:Dynamic) {
-				for (reporter in reporters) reporter.addMessage({
-					fileName:file.name,
-					message:"Check " + check.getModuleName() + " failed: " +
-								e + "\nStacktrace: " + CallStack.toString(CallStack.exceptionStack()),
-					line:1,
-					column:1,
-					severity:ERROR,
-					moduleName:"Checker"
-				});
+				for (reporter in reporters) {
+					reporter.addMessage({
+						fileName:file.name,
+						message:"Check " + check.getModuleName() + " failed: " +
+									e + "\nStacktrace: " + CallStack.toString(CallStack.exceptionStack()),
+						line:1,
+						column:1,
+						severity:ERROR,
+						moduleName:"Checker"
+					});
+				}
 			}
 		}
 

checkstyle/ComplexTypeUtils.hx

@@ -9,7 +9,7 @@ import haxeparser.Data.EnumConstructor;
 import haxe.macro.Expr;
 
 class ComplexTypeUtils {
-	
+
 	public static function walkFile(file:{ pack:Array<String>, decls:Array<TypeDecl> }, cb:ComplexTypeCallback) {
 		for (decl in file.decls) walkTypeDecl(decl, cb);
 	}
@@ -42,9 +42,11 @@ class ComplexTypeUtils {
 
 	public static function walkClass(d:Definition<ClassFlag, Array<Field>>, pos:Position, cb:ComplexTypeCallback) {
 		walkCommonDefinition(d, pos, cb);
-		for (f in d.flags) switch f {
-			case HExtends(t) | HImplements(t): walkTypePath(t, d.name, pos, cb);
-			default:
+		for (f in d.flags) {
+			switch(f) {
+				case HExtends(t) | HImplements(t): walkTypePath(t, d.name, pos, cb);
+				default:
+			}
 		}
 		for (f in d.data) walkField(f, cb);
 	}
@@ -61,9 +63,11 @@ class ComplexTypeUtils {
 
 	public static function walkAbstract(d:Definition<AbstractFlag, Array<Field>>, pos:Position, cb:ComplexTypeCallback) {
 		walkCommonDefinition(d, pos, cb);
-		for (f in d.flags) switch f {
-			case AFromType(ct) | AToType(ct) | AIsType(ct): walkComplexType(ct, f.getName(), pos, cb);
-			default:
+		for (f in d.flags) {
+			switch(f) {
+				case AFromType(ct) | AToType(ct) | AIsType(ct): walkComplexType(ct, f.getName(), pos, cb);
+				default:
+			}
 		}
 		for (f in d.data) walkField(f, cb);
 	}
@@ -129,7 +133,7 @@ class ComplexTypeUtils {
 				if (e != null) walkExpr(e, cb);
 		}
 	}
-	
+
 	public static function walkComplexType(t:ComplexType, name:String, pos:Position, cb:ComplexTypeCallback) {
 		cb(t, name, pos);
 		switch(t){

checkstyle/ExprUtils.hx

@@ -9,7 +9,7 @@ import haxeparser.Data.EnumConstructor;
 import haxe.macro.Expr;
 
 class ExprUtils {
-	
+
 	public static function walkFile(file:{ pack: Array<String>, decls: Array<TypeDecl> }, cb:Expr -> Void) {
 		for (decl in file.decls) walkTypeDecl(decl, cb);
 	}
@@ -42,9 +42,11 @@ class ExprUtils {
 
 	public static function walkClass(d:Definition<ClassFlag, Array<Field>>, cb:Expr -> Void) {
 		walkCommonDefinition(d, cb);
-		for (f in d.flags) switch f {
-			case HExtends(t) | HImplements(t): walkTypePath(t,cb);
-			default:
+		for (f in d.flags) {
+			switch(f) {
+				case HExtends(t) | HImplements(t): walkTypePath(t,cb);
+				default:
+			}
 		}
 		for (f in d.data) walkField(f,cb);
 	}
@@ -61,9 +63,11 @@ class ExprUtils {
 
 	public static function walkAbstract(d:Definition<AbstractFlag, Array<Field>>, cb:Expr -> Void) {
 		walkCommonDefinition(d, cb);
-		for (f in d.flags) switch f {
-			case AFromType(ct) | AToType(ct) | AIsType(ct): walkComplexType(ct,cb);
-			default:
+		for (f in d.flags) {
+			switch(f) {
+				case AFromType(ct) | AToType(ct) | AIsType(ct): walkComplexType(ct,cb);
+				default:
+			}
 		}
 		for (f in d.data) walkField(f,cb);
 	}
@@ -129,7 +133,7 @@ class ExprUtils {
 				if (e != null) walkExpr(e, cb);
 		}
 	}
-	
+
 	public static function walkComplexType(t:ComplexType, cb:Expr -> Void) {
 		switch(t){
 			case TPath(p): walkTypePath(p, cb);

checkstyle/Report.hx

@@ -23,7 +23,7 @@ class Report {
 		reportFile = File.write("CHECKS.md", false);
 		reportFile.writeString("###Report of default checks on CheckStyle library itself\n\n");
 		#end
-		
+
 		var errors = 0;
 		var warnings = 0;
 		var infos = 0;

checkstyle/checks/AnonymousCheck.hx

@@ -29,15 +29,15 @@ class AnonymousCheck extends Check {
 			}
 		}
 	}
-	
+
 	function checkField(f:Field) {
 		switch(f.kind) {
 			case FVar(TAnonymous(fields), val):
 				error(f.name, f.pos);
 			default:
 		}
 	}
-	
+
 	function checkLocalVars() {
 		ExprUtils.walkFile(checker.ast, function(e) {
 			switch(e.expr){

checkstyle/checks/ArrayInstantiationCheck.hx

@@ -7,7 +7,7 @@ import haxeparser.Data.Token;
 @name("ArrayInstantiation")
 @desc("Checks if the array is instantiated using [], not with new")
 class ArrayInstantiationCheck extends Check {
-	
+
 	override function actualRun() {
 		ExprUtils.walkFile(checker.ast, function(e:Expr) {
 			switch(e.expr){

checkstyle/checks/BlockFormatCheck.hx

@@ -5,7 +5,7 @@ import checkstyle.LintMessage.SeverityLevel;
 @name("BlockFormat")
 @desc("Checks empty blocks and first/last lines of a block")
 class BlockFormatCheck extends Check {
-	
+
 	public var emptyBlockCheck:Bool;
 
 	var firstLineRE:EReg;
@@ -20,10 +20,12 @@ class BlockFormatCheck extends Check {
 
 	override function actualRun() {
 		ExprUtils.walkFile(checker.ast, function(e) {
+			if (isPosSuppressed(e.pos)) return;
 			switch(e.expr){
 				case EBlock([]) | EObjectDecl([]):
-					if (emptyBlockCheck && e.pos.max - e.pos.min > "{}".length)
+					if (emptyBlockCheck && e.pos.max - e.pos.min > "{}".length) {
 						logPos("Empty block should be written as {}", e.pos, Reflect.field(SeverityLevel, severity));
+					}
 				case EBlock(_) | EObjectDecl(_):
 					var lmin = checker.getLinePos(e.pos.min).line;
 					var lmax = checker.getLinePos(e.pos.max).line;

checkstyle/checks/Check.hx

@@ -75,6 +75,10 @@ class Check {
 		return isCharPosSuppressed(pos);
 	}
 
+	function isPosExtern(pos:Position):Bool {
+		return isCharPosExtern(pos.min);
+	}
+
 	function isPosSuppressed(pos:Position):Bool {
 		return isCharPosSuppressed(pos.min);
 	}
@@ -131,6 +135,37 @@ class Check {
 		return false;
 	}
 
+	function isCharPosExtern(pos:Int):Bool {
+		for (td in checker.ast.decls) {
+			switch (td.decl){
+				case EAbstract(d):
+				case EClass(d):
+					if ((pos <= td.pos.max) && (pos >= td.pos.min)) {
+						return d.flags.indexOf(HExtern) > -1;
+					}
+				case EEnum(d):
+					if ((pos <= td.pos.max) && (pos >= td.pos.min)) {
+						return d.flags.indexOf(EExtern) > -1;
+					}
+				case ETypedef(d):
+					if ((pos <= td.pos.max) && (pos >= td.pos.min)) {
+						return d.flags.indexOf(EExtern) > -1;
+					}
+					switch (d.data) {
+						case TAnonymous(fields):
+							for (field in fields) {
+								if (pos > field.pos.max) continue;
+								if (pos < field.pos.min) continue;
+								return d.flags.indexOf(EExtern) > -1;
+							}
+						default:
+					}
+				default:
+			}
+		}
+		return false;
+	}
+
 	function checkSuppressionConst(e:Expr, search:String):Bool {
 		switch (e.expr) {
 			case EArrayDecl(a):

checkstyle/checks/CyclomaticComplexityCheck.hx

@@ -22,7 +22,7 @@ class CyclomaticComplexityCheck extends Check {
 			{ severity : "ERROR", complexity : 25 }
 		];
 	}
-	
+
 	override function actualRun() {
 		checker.ast.decls.map(function(type:TypeDecl):Null<Definition<ClassFlag, Array<Field>>> {
 			return switch (type.decl) {
@@ -33,21 +33,20 @@ class CyclomaticComplexityCheck extends Check {
 			return definition != null;
 		}).iter(checkFields);
 	}
-	
+
 	function checkFields(definition:Definition<ClassFlag, Array<Field>>) {
 		definition.data.map(function(field:Field):Null<Target> {
 			return switch (field.kind) {
 				case FieldType.FFun(f):
-					if (isCheckSuppressed(field))
-						null;
+					if (isCheckSuppressed(field)) null;
 					else { name:field.name, expr:f.expr, pos:field.pos};
 				default: null;
 			}
 		}).filter(function(f:Null<Target>):Bool {
 			return f != null;
 		}).iter(calculateComplexity);
 	}
-	
+
 	function calculateComplexity(method:Target) {
 		var complexity:Int = 1 + evaluateExpr(method.expr);
 
@@ -62,7 +61,7 @@ class CyclomaticComplexityCheck extends Check {
 
 	// This would not pass the cyclomatic complexity test.
 
-	@SuppressWarnings('checkstyle:CyclomaticComplexity')
+	@SuppressWarnings(['checkstyle:CyclomaticComplexity', 'checkstyle:LeftCurly'])
 	function evaluateExpr(e:Expr):Int {
 		if (e == null || e.expr == null) return 0;
 		return switch(e.expr) {