diff --git a/CHANGELOG.md b/CHANGELOG.md index 67f0516c..6209025a 100644 --- 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 index 3bbb987b..fc51fa7c 100644 --- 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 index 8065e3e5..bb2b9be2 100644 --- 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 index 3c20ea8a..4935c00c 100644 --- 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 }