fix metadata with parameter, fixes #241 (#242)

* fix metadata with parameter, fixes #241
* added testcase, #240

CHANGELOG.md

@@ -13,6 +13,7 @@
 - Fixed wrapping function signature with long type hint, fixes [#189](https://github.com/HaxeCheckstyle/haxe-formatter/issues/189) ([#239](https://github.com/HaxeCheckstyle/haxe-formatter/issues/239))
 - Fixed indentation with comment line, fixes [#237](https://github.com/HaxeCheckstyle/haxe-formatter/issues/237) ([#239](https://github.com/HaxeCheckstyle/haxe-formatter/issues/239))
 - Fixed wrapping option keep, fixes [#238](https://github.com/HaxeCheckstyle/haxe-formatter/issues/238) ([#239](https://github.com/HaxeCheckstyle/haxe-formatter/issues/239))
+- Fixed handling of metadata parameter, fixes [#241](https://github.com/HaxeCheckstyle/haxe-formatter/issues/241) ([#242](https://github.com/HaxeCheckstyle/haxe-formatter/issues/242))
 - Changed default rules for function signature, see [#232](https://github.com/HaxeCheckstyle/haxe-formatter/issues/232) ([#233](https://github.com/HaxeCheckstyle/haxe-formatter/issues/233))
 - Refactored marker classes to use a common base class [#239](https://github.com/HaxeCheckstyle/haxe-formatter/issues/239)
 

src/formatter/marker/MarkWrapping.hx

@@ -61,7 +61,8 @@ class MarkWrapping extends MarkerBase {
 					if ((info.whitespaceAfter != Newline) && (info.whitespaceAfter != SpaceOrNewline)) {
 						whitespace(close, After);
 					}
-				case Semicolon, Dot, POpen:
+				case POpen:
+				case Semicolon, Dot:
 					whitespace(close, NoneAfter);
 				case Binop(OpGt):
 					whitespace(close, NoneAfter);

test/testcases/emptylines/issue_240_class_empty_lines.hxtest

@@ -0,0 +1,25 @@
+{
+	"emptyLines": {
+		"classEmptyLines": {
+			"beginType": 1
+		},
+		"afterLeftCurly": "keep"
+	}
+}
+
+---
+
+class Main {
+	static function main() {
+		doSomething("");
+	}
+}
+
+---
+
+class Main {
+
+	static function main() {
+		doSomething("");
+	}
+}

test/testcases/whitespace/issue_241_metadata_with_parameter.hxtest

@@ -0,0 +1,22 @@
+{}
+
+
+---
+
+
+class Main {
+	@:overload(function())
+	static function main() {
+		trace(@:privateAccess (X).object);
+	}
+}
+
+
+---
+
+class Main {
+	@:overload(function())
+	static function main() {
+		trace(@:privateAccess (X).object);
+	}
+}

test/testcases/whitespace/issue_241_metadata_with_parameter_with_popen_before.hxtest

@@ -0,0 +1,25 @@
+{
+	"whitespace": {
+		"openingParenPolicy": "before"
+	}
+}
+
+---
+
+
+class Main {
+	@:overload(function())
+	static function main() {
+		trace(@:privateAccess (X).object);
+	}
+}
+
+
+---
+
+class Main {
+	@:overload(function ())
+	static function main () {
+		trace (@:privateAccess (X).object);
+	}
+}

test/testcases/whitespace/whitespace_after_type_parameter.hxtest

@@ -0,0 +1,19 @@
+{
+	"whitespace": {
+		"openingParenPolicy": "before"
+	}
+}
+
+
+---
+
+
+class Main {
+	static function main<T>():Array<T> {}
+}
+
+---
+
+class Main {
+	static function main<T> ():Array<T> {}
+}