prepare v1.1.2 (#246)

HaxeCheckstyle · Oct 17, 2018 · 19f2f3b · 19f2f3b
1 parent d365a22
commit 19f2f3b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## dev branch / next version (1.x.x)
 
+## version 1.1.2 (2018-10-17)
+
 - 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)
 

diff --git a/haxelib.json b/haxelib.json
@@ -8,8 +8,8 @@
 		"style"
 	],
 	"description": "A code formatter for Haxe",
-	"version": "1.1.1",
-	"releasenote": "added method chain wrapping, refactored whitespace and newline handling - see CHANGELOG for details.",
+	"version": "1.1.2",
+	"releasenote": "fixed an endless loop when using #if (macro) - see CHANGELOG for details.",
 	"contributors": [
 		"AlexHaxe",
 		"Gama11"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "haxe-formatter",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "description": "A code formatter for Haxe",
     "repository": {
         "type": "git",

diff --git a/test/testcases/other/sharp_if_parens_macro_hang.hxtest b/test/testcases/other/sharp_if_parens_macro_hang.hxtest
@@ -7,6 +7,12 @@ class Main {
 	static function main() {
 	}
 	#end
+	#if (!macro)
+	static function main() {}
+	#end
+	#if !macro
+	static function main() {}
+	#end
 }
 
 ---
@@ -15,4 +21,12 @@ class Main {
 	#if (macro)
 	static function main() {}
 	#end
+
+	#if (!macro)
+	static function main() {}
+	#end
+
+	#if !macro
+	static function main() {}
+	#end
 }