fixed whitespace after else with ifPolicy, fixes #543 (#544)

* fixed whitespace after else with ifPolicy, fixes #543
* fixed emptyline afterReturn when return is body of function

CHANGELOG.md

@@ -7,6 +7,8 @@
 - Fixed extra indentation for parens after `=`, fixes [#534](https://github.com/HaxeCheckstyle/haxe-formatter/issues/534) ([#535](https://github.com/HaxeCheckstyle/haxe-formatter/issues/535))
 - Fixed method chain with comments detection and wrapping ([#536](https://github.com/HaxeCheckstyle/haxe-formatter/issues/536))
 - Fixed whitespace before metadata ([#537](https://github.com/HaxeCheckstyle/haxe-formatter/issues/537))
+- Fixed whitespace after else with ifPolicy, fixes [#543](https://github.com/HaxeCheckstyle/haxe-formatter/issues/543)  ([#544](https://github.com/HaxeCheckstyle/haxe-formatter/issues/544))
+- Fixed emptyline afterReturn when return is body of function ([#544](https://github.com/HaxeCheckstyle/haxe-formatter/issues/544))
 - Refactored build system to use lix ([#537](https://github.com/HaxeCheckstyle/haxe-formatter/issues/537) + [#539](https://github.com/HaxeCheckstyle/haxe-formatter/issues/539))
 
 ## version 1.9.1 (2019-09-12)

src/formatter/marker/MarkEmptyLines.hx

@@ -829,6 +829,9 @@ class MarkEmptyLines extends MarkerBase {
 	function markReturn() {
 		var returns:Array<TokenTree> = parsedCode.root.filter([Kwd(KwdReturn)], ALL);
 		for (ret in returns) {
+			if (isReturnBody(ret)) {
+				continue;
+			}
 			var lastChild:TokenTree = TokenTreeCheckUtils.getLastToken(ret);
 			if (lastChild == null) {
 				continue;
@@ -845,6 +848,21 @@ class MarkEmptyLines extends MarkerBase {
 		}
 	}
 
+	function isReturnBody(ret:TokenTree):Bool {
+		var parent:TokenTree = ret.parent;
+		while ((parent != null) && (parent.tok != null)) {
+			switch (parent.tok) {
+				case Kwd(KwdFunction):
+					return true;
+				case BrOpen:
+					return false;
+				default:
+					parent = parent.parent;
+			}
+		}
+		return true;
+	}
+
 	function markSharp() {
 		var sharps:Array<TokenTree> = parsedCode.root.filterCallback(function(token:TokenTree, index:Int):FilterResult {
 			return switch (token.tok) {

src/formatter/marker/MarkWhitespace.hx

@@ -256,8 +256,11 @@ class MarkWhitespace extends MarkerBase {
 				whitespace(token, NoneAfter);
 			case Kwd(KwdExtends), Kwd(KwdImplements):
 				whitespace(token, Around);
-			case Kwd(KwdIf), Kwd(KwdElse):
+			case Kwd(KwdIf):
 				whitespace(token, config.whitespace.ifPolicy);
+			case Kwd(KwdElse):
+				var policy:WhitespacePolicy = config.whitespace.ifPolicy;
+				whitespace(token, policy.add(After));
 			case Kwd(KwdDo):
 				whitespace(token, config.whitespace.doPolicy);
 			case Kwd(KwdWhile):

test/testcases/emptylines/end_type_empty_line_with_return_body.hxtest

@@ -0,0 +1,26 @@
+{
+	"emptyLines": {
+		"classEmptyLines": {
+			"beginType": 1,
+			"endType": 1
+		},
+		"afterLeftCurly": "keep",
+		"beforeRightCurly": "keep"
+	}
+}
+
+---
+
+class Main {
+	function main2()
+		return "";
+}
+
+---
+
+class Main {
+
+	function main2()
+		return "";
+
+}

test/testcases/whitespace/issue_543_ifPolicy_after_else.hxtest

@@ -0,0 +1,21 @@
+{
+  "whitespace": {
+    "ifPolicy": "onlyBefore"
+  }
+}
+
+---
+
+class Main {
+	static function main() {
+		return if(self == id) self else id;
+	}
+}
+
+---
+
+class Main {
+	static function main() {
+		return if(self == id) self else id;
+	}
+}