Merge pull request #14 from AlexHaxe/suppressWarnings

added @SuppressWarnings to typedefs, enums and classes

Author: AlexHaxe

checkstyle/ComplexTypeUtils.hx

@@ -53,9 +53,9 @@ class ComplexTypeUtils {
 		walkCommonDefinition(d, pos, cb);
 		for (ec in d.data) {
 			walkMeta(ec.meta, cb);
-			for (arg in ec.args) walkComplexType(arg.type, ec.name, pos, cb);
-			for (param in ec.params) walkTypeParamDecl(param, pos, cb);
-			if (ec.type != null) walkComplexType(ec.type, ec.name, pos, cb);
+			for (arg in ec.args) walkComplexType(arg.type, ec.name, ec.pos, cb);
+			for (param in ec.params) walkTypeParamDecl(param, ec.pos, cb);
+			if (ec.type != null) walkComplexType(ec.type, ec.name, ec.pos, cb);
 		}
 	}
 

checkstyle/checks/Check.hx

@@ -45,10 +45,15 @@ class Check {
 	}
 
 	function isCheckSuppressed(f:Field):Bool {
-		if (f == null || f.meta == null) return false;
+		if (f == null) return false;
+		if (hasSuppressWarningsMeta (f.meta)) return true;
+		return isPosSuppressed (f.pos);
+	}
 
+	function hasSuppressWarningsMeta(m:Metadata):Bool {
+		if (m == null) return false;
 		var search = 'checkstyle:${getModuleName ()}';
-		for (meta in f.meta) {
+		for (meta in m) {
 			if (meta.name != "SuppressWarnings") continue;
 			if (meta.params == null) continue;
 			for (param in meta.params) {
@@ -73,11 +78,44 @@ class Check {
 	function isCharPosSuppressed(pos:Int):Bool {
 		for (td in _checker.ast.decls) {
 			switch (td.decl){
+				case EAbstract(d):
+					if ((pos <= td.pos.max) && (pos >= td.pos.min)) {
+						if (hasSuppressWarningsMeta (d.meta)) return true;
+					}
+					for (field in d.data) {
+						if (pos > field.pos.max) continue;
+						if (pos < field.pos.min) continue;
+						return hasSuppressWarningsMeta (field.meta);
+					}
 				case EClass(d):
+					if ((pos <= td.pos.max) && (pos >= td.pos.min)) {
+						if (hasSuppressWarningsMeta (d.meta)) return true;
+					}
 					for (field in d.data) {
 						if (pos > field.pos.max) continue;
 						if (pos < field.pos.min) continue;
-						return isCheckSuppressed (field);
+						return hasSuppressWarningsMeta (field.meta);
+					}
+				case EEnum(d):
+					if ((pos <= td.pos.max) && (pos >= td.pos.min)) {
+						if (hasSuppressWarningsMeta (d.meta)) return true;
+					}
+					for (item in d.data) {
+						if (pos > item.pos.max) continue;
+						if (pos < item.pos.min) continue;
+						return hasSuppressWarningsMeta (item.meta);
+					}
+				case ETypedef(d):
+					switch (d.data) {
+						case TAnonymous(fields):
+							for (field in fields) {
+								if (pos > field.pos.max) continue;
+								if (pos < field.pos.min) continue;
+								if (hasSuppressWarningsMeta (field.meta)) return true;
+								// typedef pos does not include body
+								return hasSuppressWarningsMeta (d.meta);
+							}
+						default:
 					}
 				default:
 			}

test/DynamicCheckTest.hx

@@ -38,14 +38,40 @@ class DynamicTests {
 		}
 	}
 
+	@SuppressWarnings('checkstyle:Dynamic')
+	class Testa {
+		public var a:Int;
+		private var b:Int;
+		static var COUNT:Int = 1;
+		var count6:Dynamic;
+
+		function calc(val:Dynamic, val2:Dynamic):Dynamic {
+			return null;
+		}
+	}
+
 	enum Test2 {
 		count;
-		a;
+		@SuppressWarnings('checkstyle:Dynamic')
+		a(field:Dynamic);
 	}
-	
+
+	@SuppressWarnings('checkstyle:Dynamic')
+	enum Test2a {
+		count;
+		a(field:Dynamic);
+	}
+
 	typedef Test3 = {
 		var count1:Int;
-		var count2:String;
+		@SuppressWarnings('checkstyle:Dynamic')
+		var count2:Dynamic;
+	}
+
+	@SuppressWarnings('checkstyle:Dynamic')
+	typedef Test3a = {
+		var count1:Int;
+		var count2:Dynamic;
 	}";
 
 	public static inline var TEST1:String = "

test/NestedForDepthCheckTest.hx

@@ -49,6 +49,21 @@ class NestedForDepthTests {
 				}
 			}
 		}
+	}
+
+	@SuppressWarnings('checkstyle:NestedForDepth')
+	class Test2 {
+		public function test2(param:Array<Int>) {
+			for (outerParam in params) {                      // level 0
+				for (middleParam in params) {                 // level 1
+					for (innerParam in params) {              // level 2
+						if (outerParam == innerParam) {
+							trace (param);
+						}
+					}
+				}
+			}
+		}
 	}";
 
 	public static inline var TEST2:String =