allow ABSTRACT/CLASS without PUBLIC / PRIVATE, fixes #343 (#345)

* allow ABSTRACT/CLASS without PUBLIC / PRIVATE, fixes #343
* added comments

Author: AlexHaxe

src/checkstyle/checks/naming/MemberNameCheck.hx

@@ -11,6 +11,7 @@ class MemberNameCheck extends NameCheckBase<MemberNameCheckToken> {
 
 	override function checkClassType(decl:TypeDef, d:Definition<ClassFlag, Array<Field>>, pos:Position) {
 		if (!hasToken(CLASS)) {
+			// if ABSTRACT is set, PUBLIC and PRIVATE don't affect CLASS
 			if (hasToken(ABSTRACT)) return;
 			if (!hasToken(PUBLIC) && !hasToken(PRIVATE)) return;
 		}
@@ -26,6 +27,7 @@ class MemberNameCheck extends NameCheckBase<MemberNameCheckToken> {
 
 	override function checkAbstractType(decl:TypeDef, d:Definition<AbstractFlag, Array<Field>>, pos:Position) {
 		if (!hasToken(ABSTRACT)) {
+			// if CLASS is set, PUBLIC and PRIVATE don't affect ABSTRACT
 			if (hasToken(CLASS)) return;
 			if (!hasToken(PUBLIC) && !hasToken(PRIVATE)) return;
 		}
@@ -73,8 +75,11 @@ class MemberNameCheck extends NameCheckBase<MemberNameCheckToken> {
 
 	function checkField(f:Field, t:ComplexType, e:Expr, p:ParentType) {
 		if (f.isStatic(p)) return;
-		if (!hasToken(PUBLIC) && f.isPublic(p)) return;
-		if (!hasToken(PRIVATE) && f.isPrivate(p)) return;
+		if (hasToken(PUBLIC) || hasToken(PRIVATE)) {
+			// with PUBLIC or PRIVATE set, only look at fields with matching access modifiers
+			if (!hasToken(PUBLIC) && f.isPublic(p)) return;
+			if (!hasToken(PRIVATE) && f.isPrivate(p)) return;
+		}
 
 		matchTypeName("member", f.name, f.pos);
 	}

test/checks/naming/MemberNameCheckTest.hx

@@ -33,6 +33,20 @@ class MemberNameCheckTest extends CheckTestCase<MemberNameCheckTests> {
 		assertMsg(check, TEST5, 'Invalid enum member signature: "VALUE_TEST" (name should be "~/${check.format}/")');
 	}
 
+	public function testTokenClass() {
+		var check = new MemberNameCheck();
+		check.tokens = [CLASS];
+
+		var memberMessage = 'Invalid member signature: "Count" (name should be "~/${check.format}/")';
+		assertNoMsg(check, TEST);
+		assertMsg(check, TEST1, memberMessage);
+		assertMsg(check, TEST2, 'Invalid member signature: "Count" (name should be "~/${check.format}/")');
+		assertNoMsg(check, TEST3);
+		assertNoMsg(check, TEST4);
+		assertNoMsg(check, TEST5);
+		assertNoMsg(check, ABSTRACT_FIELDS);
+	}
+
 	public function testTokenPublic() {
 		var check = new MemberNameCheck();
 		check.tokens = [CLASS, PUBLIC];
@@ -149,6 +163,10 @@ class MemberNameCheckTest extends CheckTestCase<MemberNameCheckTests> {
 		assertNoMsg(check, TEST);
 		assertMsg(check, ABSTRACT_FIELDS, 'Invalid member signature: "EnumConstructor3" (name should be "~/${check.format}/")');
 
+		check.tokens = [ABSTRACT];
+		assertNoMsg(check, TEST);
+		assertMsg(check, ABSTRACT_FIELDS, 'Invalid member signature: "EnumConstructor3" (name should be "~/${check.format}/")');
+
 		check.tokens = [ABSTRACT, PRIVATE];
 		assertNoMsg(check, ABSTRACT_FIELDS);