Merge pull request #294 from HaxeCheckstyle/#293

update for #293

Author: adireddy

haxelib.json

@@ -16,8 +16,8 @@
 	"contributors": [
 		"adireddy"
 	],
-	"releasenote": "bug fixes",
-	"version": "2.1.3",
+	"releasenote": "enhancement to RedundantModifier check",
+	"version": "2.1.4",
 	"url": "https://github.com/HaxeCheckstyle/haxe-checkstyle",
 	"dependencies": {
 

package.json

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

resources/default-config.json

@@ -373,6 +373,8 @@
 		},
 		{
 			"props": {
+				"enforcePrivate": false,
+				"enforcePublic": false,
 				"enforcePublicPrivate": false
 			},
 			"type": "RedundantModifier"

src/checkstyle/checks/modifier/RedundantModifierCheck.hx

@@ -10,27 +10,36 @@ using checkstyle.utils.FieldUtils;
 class RedundantModifierCheck extends Check {
 
 	public var enforcePublicPrivate:Bool;
+	public var enforcePublic:Bool;
+	public var enforcePrivate:Bool;
 
 	public function new() {
 		super(AST);
 		enforcePublicPrivate = false;
+		enforcePublic = false;
+		enforcePrivate = false;
 		categories = [Category.STYLE, Category.CLARITY];
 		points = 1;
 	}
 
 	override function actualRun() {
+		if (enforcePublicPrivate) {
+			enforcePrivate = true;
+			enforcePublic = true;
+		}
 		forEachField(checkField);
 	}
 
 	function checkField(f:Field, p:ParentType) {
 		var isDefaultPrivate = f.isDefaultPrivate(p);
 		var implicitAccess = isDefaultPrivate ? "private" : "public";
-		if (enforcePublicPrivate) {
-			if (!f.access.contains(APublic) && !f.access.contains(APrivate)) {
+		if (!f.access.contains(APublic) && !f.access.contains(APrivate)) {
+			if ((!isDefaultPrivate && enforcePublic) || (isDefaultPrivate && enforcePrivate)) {
 				logPos('Missing "$implicitAccess" keyword for "${f.name}"', f.pos);
 			}
 		}
-		else if ((isDefaultPrivate && f.access.contains(APrivate)) || (!isDefaultPrivate && f.access.contains(APublic))) {
+
+		if ((!enforcePrivate && isDefaultPrivate && f.access.contains(APrivate)) || (!enforcePublic && !isDefaultPrivate && f.access.contains(APublic))) {
 			logPos('"$implicitAccess" keyword is redundant for "${f.name}"', f.pos);
 		}
 	}

test/checks/modifier/RedundantModifierCheckTest.hx

@@ -79,6 +79,22 @@ class RedundantModifierCheckTest extends CheckTestCase<RedundantModifierCheckTes
 		assertNoMsg(check, TEST14);
 		assertNoMsg(check, TEST15);
 	}
+
+	public function testJustPublic() {
+		var check = new RedundantModifierCheck();
+		check.enforcePublic = true;
+		assertMsg(check, TEST3, 'Missing "public" keyword for "a"');
+		assertMsg(check, TEST1, '"private" keyword is redundant for "a"');
+		assertNoMsg(check, TEST4);
+	}
+
+	public function testJustPrivate() {
+		var check = new RedundantModifierCheck();
+		check.enforcePrivate = true;
+		assertMsg(check, TEST12, 'Missing "private" keyword for "foo"');
+		assertMsg(check, TEST2, '"public" keyword is redundant for "a"');
+		assertNoMsg(check, TEST3);
+	}
 }
 
 @:enum