diff --git a/CHANGELOG.md b/CHANGELOG.md index c98ba249..bf81d9f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,9 @@ ## dev branch / next version (1.x.x) -- Added whitespace policies for `ifConditionParens`, `switchConditionParens`, `whileConditionParens`, `sharpConditionParens` and `catchParens` - a all inside `whitespace.parenConfig`, fixes [#583](https://github.com/HaxeCheckstyle/haxe-formatter/issues/583) ([#585](https://github.com/HaxeCheckstyle/haxe-formatter/issues/585)) +## version 1.11.0 (2020-06-07) + +- Added whitespace policies for `ifConditionParens`, `switchConditionParens`, `whileConditionParens`, `sharpConditionParens` and `catchParens` - all inside `whitespace.parenConfig`, fixes [#583](https://github.com/HaxeCheckstyle/haxe-formatter/issues/583) ([#585](https://github.com/HaxeCheckstyle/haxe-formatter/issues/585)) - Fixed type hint whitespace in anonymous types, fixes [#586](https://github.com/HaxeCheckstyle/haxe-formatter/issues/586) ([#587](https://github.com/HaxeCheckstyle/haxe-formatter/issues/587)) - Fixed type hint whitespace with conditionals, fixes [#582](https://github.com/HaxeCheckstyle/haxe-formatter/issues/582) ([#587](https://github.com/HaxeCheckstyle/haxe-formatter/issues/587)) - Fixed whitspace handling for anon types as type parameter, fixes [#588](https://github.com/HaxeCheckstyle/haxe-formatter/issues/588) ([#590](https://github.com/HaxeCheckstyle/haxe-formatter/issues/590)) diff --git a/haxe3_libraries/tokentree.hxml b/haxe3_libraries/tokentree.hxml index 65284b86..67301e85 100644 --- a/haxe3_libraries/tokentree.hxml +++ b/haxe3_libraries/tokentree.hxml @@ -1,3 +1,3 @@ -# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#44f5926539c25e524ffa1fbc3d26a15f38c9bc2b" into tokentree/1.0.27/github/44f5926539c25e524ffa1fbc3d26a15f38c9bc2b --cp ${HAXE_LIBCACHE}/tokentree/1.0.27/github/44f5926539c25e524ffa1fbc3d26a15f38c9bc2b/src --D tokentree=1.0.27 \ No newline at end of file +# @install: lix --silent download "haxelib:/tokentree#1.0.28" into tokentree/1.0.28/haxelib +-cp ${HAXE_LIBCACHE}/tokentree/1.0.28/haxelib/src +-D tokentree=1.0.28 \ No newline at end of file diff --git a/haxe_libraries/tokentree.hxml b/haxe_libraries/tokentree.hxml index 65284b86..67301e85 100644 --- a/haxe_libraries/tokentree.hxml +++ b/haxe_libraries/tokentree.hxml @@ -1,3 +1,3 @@ -# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#44f5926539c25e524ffa1fbc3d26a15f38c9bc2b" into tokentree/1.0.27/github/44f5926539c25e524ffa1fbc3d26a15f38c9bc2b --cp ${HAXE_LIBCACHE}/tokentree/1.0.27/github/44f5926539c25e524ffa1fbc3d26a15f38c9bc2b/src --D tokentree=1.0.27 \ No newline at end of file +# @install: lix --silent download "haxelib:/tokentree#1.0.28" into tokentree/1.0.28/haxelib +-cp ${HAXE_LIBCACHE}/tokentree/1.0.28/haxelib/src +-D tokentree=1.0.28 \ No newline at end of file diff --git a/haxelib.json b/haxelib.json index 4b463226..6012cb53 100644 --- a/haxelib.json +++ b/haxelib.json @@ -8,8 +8,8 @@ "style" ], "description": "A code formatter for Haxe", - "version": "1.10.2", - "releasenote": "fixed a null pointer exception in tokentree - see CHANGELOG for details.", + "version": "1.11.0", + "releasenote": "added whitespace policies for parens, fixed whitespace handling for @in metadata - see CHANGELOG for details.", "contributors": [ "AlexHaxe", "Gama11" diff --git a/package-lock.json b/package-lock.json index ecd94f33..0fff6c17 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,13 @@ { "name": "haxe-formatter", - "version": "1.10.2", + "version": "1.11.0", "lockfileVersion": 1, "requires": true, "dependencies": { "lix": { - "version": "15.8.11", - "resolved": "https://registry.npmjs.org/lix/-/lix-15.8.11.tgz", - "integrity": "sha512-DqCAvConfo0d37VNj1tCDubPK7B61rt8Y3yvXIsp6qUOjEVn48NC2ZNJmKMmtdHZT2E86TJUiODN+4QejcBNWw==", + "version": "15.9.0", + "resolved": "https://registry.npmjs.org/lix/-/lix-15.9.0.tgz", + "integrity": "sha512-XyIVUZ9Mr3DNPXwbvKrAS3t1XeeBugbrva/YoMUQSJLrmCwVNlx1/ishj4bkZ/WdH1x0m1Smd767zwyr6wy/8g==", "dev": true } } diff --git a/package.json b/package.json index 41224ce3..2af38e75 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "haxe-formatter", - "version": "1.10.2", + "version": "1.11.0", "description": "A code formatter for Haxe", "repository": { "type": "git", @@ -15,7 +15,7 @@ "email": "Alexander.Blum@gmail.com" }, "devDependencies": { - "lix": "^15.8.11" + "lix": "^15.9.0" }, "bugs": "https://github.com/HaxeCheckstyle/haxe-formatter/issues", "license": "MIT"