fixed enforceReturnType in ReturnCheck

Author: AlexHaxe

checkstyle/checks/ReturnCheck.hx

@@ -30,10 +30,14 @@ class ReturnCheck extends Check {
 
 	function checkField(f:Field) {
 		if (enforceReturnType) {
-			if (Std.string(f.kind).indexOf("ret => null") > -1) {
-				_warnReturnTypeMissing(f.name, f.pos);
+			switch (f.kind) {
+				case FFun(fun):
+					if (fun.ret == null) {
+						_warnReturnTypeMissing(f.name, f.pos);
+					}
+				default:
 			}
-		} 
+		}
 		else {
 			if (Std.string(f.kind).indexOf("ret => TPath({ name => Void") > -1) {
 				_warnVoid(f.name, f.pos);

run.n

@@ -24,17 +24,44 @@ class ReturnCheckTest extends CheckTestCase {
 		check.enforceReturnType = true;
 		var msg = checkMessage(ReturnTests.TEST1, check);
 		assertEquals(msg, '');
+		msg = checkMessage(ReturnTests.TEST4, check);
+		assertEquals(msg, '');
+	}
+
+	public function testEnforceReturnTypeMissing() {
+		var check = new ReturnCheck ();
+		check.enforceReturnType = true;
+		var msg = checkMessage(ReturnTests.TEST1, check);
+		assertEquals(msg, '');
+
+		msg = checkMessage(ReturnTests.TEST2, check);
+		assertEquals(msg, 'Return type not specified when returning a value for function: test1');
+
+		msg = checkMessage(ReturnTests.TEST3, check);
+		assertEquals(msg, 'Return type not specified for function: test2');
 	}
 
-	public function testReturnTypeAllowEmptyReturn() {
+	public function testReturnTypeAllowEmptyReturnFalse() {
 		var check = new ReturnCheck ();
 		check.allowEmptyReturn = false;
+
 		var msg = checkMessage(ReturnTests.TEST2, check);
 		assertEquals(msg, 'Return type not specified when returning a value for function: test1');
 
 		msg = checkMessage(ReturnTests.TEST3, check);
 		assertEquals(msg, 'Return type not specified when returning a value for function: test2');
 	}
+
+	public function testReturnTypeAllowEmptyReturnTrue() {
+		var check = new ReturnCheck ();
+		check.allowEmptyReturn = true;
+
+		var msg = checkMessage(ReturnTests.TEST3, check);
+		assertEquals(msg, '');
+
+		msg = checkMessage(ReturnTests.TEST2, check);
+		assertEquals(msg, 'Return type not specified when returning a value for function: test1');
+	}
 }
 
 class ReturnTests {
@@ -56,4 +83,11 @@ class ReturnTests {
 			return;
 		}
 	}";
+
+	public static inline var TEST4:String =
+	"class Test {
+		public function test3():Void {
+			return;
+		}
+	}";
 }