fixed hang with #if (macro) (#245)

* fixed hang with #if (macro) * support Binop(OpAssignOp(_)) for indentation
HaxeCheckstyle · Oct 16, 2018 · d365a22 · d365a22
1 parent f4699a7
commit d365a22
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## dev branch / next version (1.x.x)
 
+- Added indentation support for `Binop(OpAssignOp(_))` [#245](https://github.com/HaxeCheckstyle/haxe-formatter/issues/245)
+- Fixed endless loop during wrapping of `#if (macro)` [#245](https://github.com/HaxeCheckstyle/haxe-formatter/issues/245)
+
 ## version 1.1.1 (2018-10-13)
 
 - Added support for key-value iterators, fixes [#232](https://github.com/HaxeCheckstyle/haxe-formatter/issues/232) ([#233](https://github.com/HaxeCheckstyle/haxe-formatter/issues/233))

diff --git a/buildCpp.hxml b/buildCpp.hxml
@@ -1,2 +1,2 @@
 buildCommon.hxml
--cpp out
+-cpp out
diff --git a/src/formatter/codedata/TokenList.hx b/src/formatter/codedata/TokenList.hx
@@ -413,7 +413,9 @@ class TokenList {
 				case Kwd(KwdFunction), Kwd(KwdMacro):
 					var lastChild:TokenTree = TokenTreeCheckUtils.getLastToken(info.token);
 					if (lastChild != null) {
-						index = lastChild.index;
+						if (lastChild.index > index) {
+							index = lastChild.index;
+						}
 						continue;
 					}
 				default:

diff --git a/src/formatter/marker/Indenter.hx b/src/formatter/marker/Indenter.hx
@@ -100,7 +100,7 @@ class Indenter {
 						if (parent.parent.is(Kwd(KwdFunction))) {
 							return findEffectiveParent(parent.parent);
 						}
-					case Binop(OpAssign):
+					case Binop(OpAssign), Binop(OpAssignOp(_)):
 						var access:TokenTreeAccessHelper = parent.access().parent().parent().is(Kwd(KwdTypedef));
 						if (access.exists()) {
 							return access.token;
@@ -202,7 +202,7 @@ class Indenter {
 							} else {
 								continue;
 							}
-						case Binop(OpAssign):
+						case Binop(OpAssign), Binop(OpAssignOp(_)):
 						case Kwd(KwdReturn), Kwd(KwdUntyped), Kwd(KwdNew):
 							if (!parsedCode.tokenList.isNewLineBefore(prevToken)) {
 								continue;
@@ -229,7 +229,7 @@ class Indenter {
 							if (!parsedCode.tokenList.isNewLineBefore(prevToken)) {
 								continue;
 							}
-						case Binop(OpAssign):
+						case Binop(OpAssign), Binop(OpAssignOp(_)):
 							if (currentToken.access().parent().parent().is(Kwd(KwdTypedef)).exists()) {
 								continue;
 							}
@@ -316,7 +316,7 @@ class Indenter {
 		switch (token.tok) {
 			case BrOpen, BkOpen, POpen, Dot:
 				return true;
-			case Binop(OpAssign):
+			case Binop(OpAssign), Binop(OpAssignOp(_)):
 				return true;
 			case Binop(OpLt):
 				return TokenTreeCheckUtils.isTypeParameter(token);

diff --git a/src/formatter/marker/MarkWrapping.hx b/src/formatter/marker/MarkWrapping.hx
@@ -62,6 +62,7 @@ class MarkWrapping extends MarkerBase {
 						whitespace(close, After);
 					}
 				case POpen:
+					wrapAfter(close, true);
 				case Semicolon, Dot:
 					whitespace(close, NoneAfter);
 				case Binop(OpGt):

diff --git a/test/testcases/indentation/nested_method_chain.hxtest b/test/testcases/indentation/nested_method_chain.hxtest
@@ -28,6 +28,7 @@ class Main {
 			.addChild (Tag.imgTag (Url.parse ("images.png"), "16", "", null)
 			.addClass ("innerClass"))
 			.addClass ("outerClass"));
+        form.addElement (new SelectElement ("type").addOption (new Option (transHtml ("Image"), "Image")).addOption (new Option (transHtml ("PDF"), "PDF")).addOption (new Option (transHtml ("Other"), "Media")));
 	}
 }
 
@@ -41,5 +42,9 @@ class Main
 			.addChild(Tag.imgTag(Url.parse("images.png"), "16", "", null)
 				.addClass("innerClass"))
 			.addClass("outerClass"));
+		form.addElement(new SelectElement("type")
+			.addOption(new Option(transHtml("Image"), "Image"))
+			.addOption(new Option(transHtml("PDF"), "PDF"))
+			.addOption(new Option(transHtml("Other"), "Media")));
 	}
 }
diff --git a/test/testcases/indentation/opassignop.hxtest b/test/testcases/indentation/opassignop.hxtest
@@ -0,0 +1,26 @@
+{}
+
+---
+
+
+class Main {
+	public function main(){
+        profiles.get (className)
+            .get (methodName)
+            .elapsedTime += t - profiles.get (className)
+            .get (methodName)
+            .startTime;
+	}
+}
+
+---
+
+class Main {
+	public function main() {
+		profiles.get(className)
+			.get(methodName)
+			.elapsedTime += t - profiles.get(className)
+				.get(methodName)
+				.startTime;
+	}
+}
diff --git a/test/testcases/other/sharp_if_parens_macro_hang.hxtest b/test/testcases/other/sharp_if_parens_macro_hang.hxtest
@@ -0,0 +1,18 @@
+{}
+
+---
+
+class Main {
+	#if (macro)
+	static function main() {
+	}
+	#end
+}
+
+---
+
+class Main {
+	#if (macro)
+	static function main() {}
+	#end
+}
diff --git a/...sue_82_parameter_wrapping.hxtest.disabled → ...apping/issue_82_parameter_wrapping.hxtest b/...sue_82_parameter_wrapping.hxtest.disabled → ...apping/issue_82_parameter_wrapping.hxtest