[3.2] Enable new CLI11 LeapFormatter for both cleos and leap-util #399
Conversation
| @@ -9420,4 +9420,134 @@ inline std::string Formatter::make_option_usage(const Option *opt) const { | |||
|
|
|||
|
|
|||
|
|
|||
|
|
|||
| class LeapFormatter : public Formatter { | |||
There was a problem hiding this comment.
Could this be pulled out into a separate header for easier integration in the future? Seems like it could be done without having to modify CLI11.hpp at all. Just have cleos and leap-util include it.
There was a problem hiding this comment.
This is autogenerated header during build process of our custom CLI11, which includes other features such as autocomplete/etc, not available in vanilla cli11. It is a separate header in https://github.com/AntelopeIO/CLI11 and is merged into this superheader on build. This header can be moved to leap repo for sure, if you think this would look better, I'll do that (and roll back / close PR in CLI11 with inclusion of this header in build and one more PR there to remove LeapFormatter from repo)
There was a problem hiding this comment.
Ignore my comment then. I have not been paying that close attention to this. I'll let @linh2931 review since he has been tracking these changes.
There was a problem hiding this comment.
How does that happen? I cloned AntelopeIO/CLI11@bd54546 and the followed the instructions to build it, i.e I did
git checkout bd545461aaca877b07867156037838abc18ad8dc
mkdir build
cd build/
cmake -DCLI11_SINGLE_FILE=ON ..
make -j
But then
grep Leap include/CLI11.hpp
has nothing. (it doesn't generate the same file as CLI11.hpp here in this PR)
There was a problem hiding this comment.
Oh no, clash of merges out of sync, should be b19d133 one sec, I'll update
There was a problem hiding this comment.
👍 yes now i'm getting something very close to what is in the PR
| for(const App* com: subcommands) { | ||
| if(com->get_name().empty()) { | ||
| if(!com->get_group().empty()) { | ||
| out << make_expanded(com); |
There was a problem hiding this comment.
Why do we need this if the name is empty?
There was a problem hiding this comment.
This is to handle "option groups" in CLI11 (in many places there). Not the cleanest way to do it, but I believe due to evolutionary reasons...
| } | ||
|
|
||
| // Drop blank spaces | ||
| tmp = detail::find_and_replace(out.str(), "\n\n", "\n"); |
There was a problem hiding this comment.
I will update these comments in CLI11 lib as well to "Drop blank lines", this header is autogenerated
|
|
||
| // Drop blank spaces | ||
| tmp = detail::find_and_replace(out.str(), "\n\n", "\n"); | ||
| tmp = tmp.substr(0, tmp.size() - 1);// Remove the final '\n' |
There was a problem hiding this comment.
Are we sure the end of the string is always '\n'?
There was a problem hiding this comment.
Yes in this context. Thank you!
Good suggestion, thank you, done - updated description |
…data Fix unpack data for signing transaction
In this pr:
New updated CLI11 lib will bring lines/pseudographics when invoking --help-all on a command / subcommand: