From 727e95bebebde1eb7c703f6082106ba5ab26c4ca Mon Sep 17 00:00:00 2001 From: AlexHaxe Date: Wed, 7 Sep 2022 14:31:23 +0200 Subject: [PATCH] improved support for inline markup (#656) * improved support for inline markup --- CHANGELOG.md | 4 ++++ haxe_libraries/haxeparser.hxml | 4 ++-- haxe_libraries/hxjsonast.hxml | 6 +++--- haxe_libraries/test-adapter.hxml | 6 +++--- haxe_libraries/tokentree.hxml | 6 +++--- haxelib.json | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f064135..06786a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## dev branch / next version (1.x.x) +## version 1.14.1 (2022-09-07) + +- Improved support for inline markup ([#656](https://github.com/HaxeCheckstyle/haxe-formatter/issues/656)) + ## version 1.14.0 (2022-08-27) - Added support for inline markup, fixes [#523](https://github.com/HaxeCheckstyle/haxe-formatter/issues/523) + [#624](https://github.com/HaxeCheckstyle/haxe-formatter/issues/624) ([#655](https://github.com/HaxeCheckstyle/haxe-formatter/issues/655)) diff --git a/haxe_libraries/haxeparser.hxml b/haxe_libraries/haxeparser.hxml index b38c4a4..c6046d1 100644 --- a/haxe_libraries/haxeparser.hxml +++ b/haxe_libraries/haxeparser.hxml @@ -1,4 +1,4 @@ -# @install: lix --silent download "gh://github.com/HaxeCheckstyle/haxeparser#7230c32c5bed0a2eef4f05260d79d25627648abe" into haxeparser/3.3.0/github/7230c32c5bed0a2eef4f05260d79d25627648abe +# @install: lix --silent download "gh://github.com/HaxeCheckstyle/haxeparser#1ea2a8915956ac3af6f1a11c67e0e56261b75929" into haxeparser/3.3.0/github/1ea2a8915956ac3af6f1a11c67e0e56261b75929 -lib hxparse --cp ${HAXE_LIBCACHE}/haxeparser/3.3.0/github/7230c32c5bed0a2eef4f05260d79d25627648abe/src +-cp ${HAXE_LIBCACHE}/haxeparser/3.3.0/github/1ea2a8915956ac3af6f1a11c67e0e56261b75929/src -D haxeparser=3.3.0 \ No newline at end of file diff --git a/haxe_libraries/hxjsonast.hxml b/haxe_libraries/hxjsonast.hxml index d152ea0..841e786 100644 --- a/haxe_libraries/hxjsonast.hxml +++ b/haxe_libraries/hxjsonast.hxml @@ -1,3 +1,3 @@ -# @install: lix --silent download "haxelib:/hxjsonast#1.0.1" into hxjsonast/1.0.1/haxelib --cp ${HAXE_LIBCACHE}/hxjsonast/1.0.1/haxelib/src --D hxjsonast=1.0.1 \ No newline at end of file +# @install: lix --silent download "haxelib:/hxjsonast#1.1.0" into hxjsonast/1.1.0/haxelib +-cp ${HAXE_LIBCACHE}/hxjsonast/1.1.0/haxelib/src +-D hxjsonast=1.1.0 \ No newline at end of file diff --git a/haxe_libraries/test-adapter.hxml b/haxe_libraries/test-adapter.hxml index a50777c..f041683 100644 --- a/haxe_libraries/test-adapter.hxml +++ b/haxe_libraries/test-adapter.hxml @@ -1,5 +1,5 @@ -# @install: lix --silent download "haxelib:/test-adapter#2.0.1" into test-adapter/2.0.1/haxelib +# @install: lix --silent download "haxelib:/test-adapter#2.0.4" into test-adapter/2.0.4/haxelib -lib json2object --cp ${HAXE_LIBCACHE}/test-adapter/2.0.1/haxelib/ --D test-adapter=2.0.1 +-cp ${HAXE_LIBCACHE}/test-adapter/2.0.4/haxelib/ +-D test-adapter=2.0.4 --macro _testadapter.Macro.init() \ No newline at end of file diff --git a/haxe_libraries/tokentree.hxml b/haxe_libraries/tokentree.hxml index cd40b7e..f91fbcc 100644 --- a/haxe_libraries/tokentree.hxml +++ b/haxe_libraries/tokentree.hxml @@ -1,3 +1,3 @@ -# @install: lix --silent download "haxelib:/tokentree#1.2.0" into tokentree/1.2.0/haxelib --cp ${HAXE_LIBCACHE}/tokentree/1.2.0/haxelib/src --D tokentree=1.2.0 \ No newline at end of file +# @install: lix --silent download "haxelib:/tokentree#1.2.1" into tokentree/1.2.1/haxelib +-cp ${HAXE_LIBCACHE}/tokentree/1.2.1/haxelib/src +-D tokentree=1.2.1 \ No newline at end of file diff --git a/haxelib.json b/haxelib.json index b1931d3..55e22cf 100644 --- a/haxelib.json +++ b/haxelib.json @@ -8,8 +8,8 @@ "style" ], "description": "A code formatter for Haxe", - "version": "1.14.0", - "releasenote": "added support for inline markup - see CHANGELOG for details.", + "version": "1.14.1", + "releasenote": "improved support for inline markup - see CHANGELOG for details.", "contributors": [ "AlexHaxe", "Gama11" diff --git a/package-lock.json b/package-lock.json index 051e295..93e38b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@haxecheckstyle/haxe-formatter", - "version": "1.14.0", + "version": "1.14.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@haxecheckstyle/haxe-formatter", - "version": "1.14.0", + "version": "1.14.1", "license": "MIT", "bin": { "haxe-formatter": "bin/formatter.js" diff --git a/package.json b/package.json index f5c3a4e..6fa046b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@haxecheckstyle/haxe-formatter", - "version": "1.14.0", + "version": "1.14.1", "description": "A code formatter for Haxe", "repository": { "type": "git",