[lldb][NFC] Fix all formatting errors in .cpp file headers
Summary:
A *.cpp file header in LLDB (and in LLDB) should like this:
```
//===-- TestUtilities.cpp -------------------------------------------------===//
```
However in LLDB most of our source files have arbitrary changes to this format and
these changes are spreading through LLDB as folks usually just use the existing
source files as templates for their new files (most notably the unnecessary
editor language indicator `-*- C++ -*-` is spreading and in every review
someone is pointing out that this is wrong, resulting in people pointing out that this
is done in the same way in other files).
This patch removes most of these inconsistencies including the editor language indicators,
all the different missing/additional '-' characters, files that center the file name, missing
trailing `===//` (mostly caused by clang-format breaking the line).
Reviewers: aprantl, espindola, jfb, shafik, JDevlieghere
Reviewed By: JDevlieghere
Subscribers: dexonsmith, wuzish, emaste, sdardis, nemanjai, kbarton, MaskRay, atanasyan, arphaman, jfb, abidh, jsji, JDevlieghere, usaxena95, lldb-commits
Tags: #lldb
Differential Revision: https://reviews.llvm.org/D73258
2020-01-24 15:23:27 +08:00
|
|
|
//===-- CommandObjectMultiword.cpp ----------------------------------------===//
|
2010-06-09 00:52:24 +08:00
|
|
|
//
|
2019-01-19 16:50:56 +08:00
|
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
2010-06-09 00:52:24 +08:00
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
2016-02-20 08:58:29 +08:00
|
|
|
#include "lldb/Interpreter/CommandObjectMultiword.h"
|
2010-06-09 00:52:24 +08:00
|
|
|
#include "lldb/Interpreter/CommandInterpreter.h"
|
|
|
|
#include "lldb/Interpreter/CommandReturnObject.h"
|
2010-06-16 03:49:27 +08:00
|
|
|
#include "lldb/Interpreter/Options.h"
|
2010-06-09 00:52:24 +08:00
|
|
|
|
|
|
|
using namespace lldb;
|
|
|
|
using namespace lldb_private;
|
|
|
|
|
|
|
|
// CommandObjectMultiword
|
|
|
|
|
2016-02-20 08:58:29 +08:00
|
|
|
CommandObjectMultiword::CommandObjectMultiword(CommandInterpreter &interpreter,
|
|
|
|
const char *name,
|
|
|
|
const char *help,
|
|
|
|
const char *syntax,
|
|
|
|
uint32_t flags)
|
2013-02-22 05:18:07 +08:00
|
|
|
: CommandObject(interpreter, name, help, syntax, flags),
|
|
|
|
m_can_be_removed(false) {}
|
2010-06-09 00:52:24 +08:00
|
|
|
|
2016-02-20 08:58:29 +08:00
|
|
|
CommandObjectMultiword::~CommandObjectMultiword() = default;
|
2010-06-09 00:52:24 +08:00
|
|
|
|
2016-11-13 10:50:32 +08:00
|
|
|
CommandObjectSP CommandObjectMultiword::GetSubcommandSP(llvm::StringRef sub_cmd,
|
2010-06-09 00:52:24 +08:00
|
|
|
StringList *matches) {
|
|
|
|
CommandObjectSP return_cmd_sp;
|
|
|
|
CommandObject::CommandMap::iterator pos;
|
2016-09-07 04:57:50 +08:00
|
|
|
|
2010-06-09 00:52:24 +08:00
|
|
|
if (!m_subcommand_dict.empty()) {
|
2020-01-29 03:23:46 +08:00
|
|
|
pos = m_subcommand_dict.find(std::string(sub_cmd));
|
2010-12-01 09:04:22 +08:00
|
|
|
if (pos != m_subcommand_dict.end()) {
|
|
|
|
// An exact match; append the sub_cmd to the 'matches' string list.
|
|
|
|
if (matches)
|
|
|
|
matches->AppendString(sub_cmd);
|
2010-06-09 00:52:24 +08:00
|
|
|
return_cmd_sp = pos->second;
|
|
|
|
} else {
|
|
|
|
StringList local_matches;
|
2016-02-20 08:58:29 +08:00
|
|
|
if (matches == nullptr)
|
2010-06-09 00:52:24 +08:00
|
|
|
matches = &local_matches;
|
2016-03-08 10:49:15 +08:00
|
|
|
int num_matches =
|
|
|
|
AddNamesMatchingPartialString(m_subcommand_dict, sub_cmd, *matches);
|
2016-09-07 04:57:50 +08:00
|
|
|
|
2010-06-09 00:52:24 +08:00
|
|
|
if (num_matches == 1) {
|
|
|
|
// Cleaner, but slightly less efficient would be to call back into this
|
2018-05-01 00:49:04 +08:00
|
|
|
// function, since I now know I have an exact match...
|
2016-09-07 04:57:50 +08:00
|
|
|
|
2010-06-09 00:52:24 +08:00
|
|
|
sub_cmd = matches->GetStringAtIndex(0);
|
2020-01-29 03:23:46 +08:00
|
|
|
pos = m_subcommand_dict.find(std::string(sub_cmd));
|
2010-06-09 00:52:24 +08:00
|
|
|
if (pos != m_subcommand_dict.end())
|
|
|
|
return_cmd_sp = pos->second;
|
|
|
|
}
|
|
|
|
}
|
2016-09-07 04:57:50 +08:00
|
|
|
}
|
2010-06-09 00:52:24 +08:00
|
|
|
return return_cmd_sp;
|
|
|
|
}
|
|
|
|
|
|
|
|
CommandObject *
|
2016-11-13 10:50:32 +08:00
|
|
|
CommandObjectMultiword::GetSubcommandObject(llvm::StringRef sub_cmd,
|
2010-06-09 00:52:24 +08:00
|
|
|
StringList *matches) {
|
|
|
|
return GetSubcommandSP(sub_cmd, matches).get();
|
|
|
|
}
|
|
|
|
|
2016-11-13 10:50:32 +08:00
|
|
|
bool CommandObjectMultiword::LoadSubCommand(llvm::StringRef name,
|
2016-02-20 08:58:29 +08:00
|
|
|
const CommandObjectSP &cmd_obj) {
|
|
|
|
if (cmd_obj)
|
2016-02-06 09:36:07 +08:00
|
|
|
assert((&GetCommandInterpreter() == &cmd_obj->GetCommandInterpreter()) &&
|
|
|
|
"tried to add a CommandObject from a different interpreter");
|
2016-09-07 04:57:50 +08:00
|
|
|
|
2010-06-09 00:52:24 +08:00
|
|
|
CommandMap::iterator pos;
|
|
|
|
bool success = true;
|
2016-09-07 04:57:50 +08:00
|
|
|
|
2020-01-29 03:23:46 +08:00
|
|
|
pos = m_subcommand_dict.find(std::string(name));
|
2010-06-09 00:52:24 +08:00
|
|
|
if (pos == m_subcommand_dict.end()) {
|
2020-01-29 03:23:46 +08:00
|
|
|
m_subcommand_dict[std::string(name)] = cmd_obj;
|
2010-06-09 00:52:24 +08:00
|
|
|
} else
|
|
|
|
success = false;
|
|
|
|
|
|
|
|
return success;
|
|
|
|
}
|
|
|
|
|
2012-06-09 05:56:10 +08:00
|
|
|
bool CommandObjectMultiword::Execute(const char *args_string,
|
|
|
|
CommandReturnObject &result) {
|
|
|
|
Args args(args_string);
|
2010-06-09 00:52:24 +08:00
|
|
|
const size_t argc = args.GetArgumentCount();
|
|
|
|
if (argc == 0) {
|
2013-06-12 09:50:57 +08:00
|
|
|
this->CommandObject::GenerateHelpText(result);
|
2016-12-09 13:46:41 +08:00
|
|
|
return result.Succeeded();
|
|
|
|
}
|
|
|
|
|
2019-09-13 19:26:48 +08:00
|
|
|
auto sub_command = args[0].ref();
|
2019-09-27 16:49:41 +08:00
|
|
|
if (sub_command.empty()) {
|
|
|
|
result.AppendError("Need to specify a non-empty subcommand.");
|
2016-12-09 13:46:41 +08:00
|
|
|
return result.Succeeded();
|
2019-09-27 16:49:41 +08:00
|
|
|
}
|
2016-12-09 13:46:41 +08:00
|
|
|
|
|
|
|
if (sub_command.equals_lower("help")) {
|
|
|
|
this->CommandObject::GenerateHelpText(result);
|
|
|
|
return result.Succeeded();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (m_subcommand_dict.empty()) {
|
|
|
|
result.AppendErrorWithFormat("'%s' does not have any subcommands.\n",
|
|
|
|
GetCommandName().str().c_str());
|
|
|
|
result.SetStatus(eReturnStatusFailed);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
StringList matches;
|
|
|
|
CommandObject *sub_cmd_obj = GetSubcommandObject(sub_command, &matches);
|
|
|
|
if (sub_cmd_obj != nullptr) {
|
|
|
|
// Now call CommandObject::Execute to process options in `rest_of_line`.
|
2018-05-01 00:49:04 +08:00
|
|
|
// From there the command-specific version of Execute will be called, with
|
|
|
|
// the processed arguments.
|
2016-12-09 13:46:41 +08:00
|
|
|
|
|
|
|
args.Shift();
|
|
|
|
sub_cmd_obj->Execute(args_string, result);
|
|
|
|
return result.Succeeded();
|
2016-09-07 04:57:50 +08:00
|
|
|
}
|
2010-06-09 00:52:24 +08:00
|
|
|
|
2016-12-09 13:46:41 +08:00
|
|
|
std::string error_msg;
|
|
|
|
const size_t num_subcmd_matches = matches.GetSize();
|
|
|
|
if (num_subcmd_matches > 0)
|
|
|
|
error_msg.assign("ambiguous command ");
|
|
|
|
else
|
|
|
|
error_msg.assign("invalid command ");
|
|
|
|
|
|
|
|
error_msg.append("'");
|
2020-01-29 03:23:46 +08:00
|
|
|
error_msg.append(std::string(GetCommandName()));
|
2016-12-09 13:46:41 +08:00
|
|
|
error_msg.append(" ");
|
2020-01-29 03:23:46 +08:00
|
|
|
error_msg.append(std::string(sub_command));
|
2016-12-09 13:46:41 +08:00
|
|
|
error_msg.append("'.");
|
|
|
|
|
|
|
|
if (num_subcmd_matches > 0) {
|
|
|
|
error_msg.append(" Possible completions:");
|
2019-08-16 22:27:35 +08:00
|
|
|
for (const std::string &match : matches) {
|
2016-12-09 13:46:41 +08:00
|
|
|
error_msg.append("\n\t");
|
2019-08-16 22:27:35 +08:00
|
|
|
error_msg.append(match);
|
2016-12-09 13:46:41 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
error_msg.append("\n");
|
|
|
|
result.AppendRawError(error_msg.c_str());
|
|
|
|
result.SetStatus(eReturnStatusFailed);
|
|
|
|
return false;
|
2010-06-09 00:52:24 +08:00
|
|
|
}
|
|
|
|
|
2013-06-12 09:50:57 +08:00
|
|
|
void CommandObjectMultiword::GenerateHelpText(Stream &output_stream) {
|
2018-05-01 00:49:04 +08:00
|
|
|
// First time through here, generate the help text for the object and push it
|
|
|
|
// to the return result object as well
|
2016-09-07 04:57:50 +08:00
|
|
|
|
2016-07-15 06:03:10 +08:00
|
|
|
CommandObject::GenerateHelpText(output_stream);
|
|
|
|
output_stream.PutCString("\nThe following subcommands are supported:\n\n");
|
2016-09-07 04:57:50 +08:00
|
|
|
|
2010-06-09 00:52:24 +08:00
|
|
|
CommandMap::iterator pos;
|
2016-03-08 11:48:41 +08:00
|
|
|
uint32_t max_len = FindLongestCommandWord(m_subcommand_dict);
|
2016-09-07 04:57:50 +08:00
|
|
|
|
2010-08-27 06:05:43 +08:00
|
|
|
if (max_len)
|
|
|
|
max_len += 4; // Indent the output by 4 spaces.
|
2016-09-07 04:57:50 +08:00
|
|
|
|
2010-06-09 00:52:24 +08:00
|
|
|
for (pos = m_subcommand_dict.begin(); pos != m_subcommand_dict.end(); ++pos) {
|
|
|
|
std::string indented_command(" ");
|
|
|
|
indented_command.append(pos->first);
|
Add infrastructure for standardizing arguments for commands and
command options; makes it easier to ensure that the same type of
argument will have the same name everywhere, hooks up help for command
arguments, so that users can ask for help when they are confused about
what an argument should be; puts in the beginnings of the ability to
do tab-completion for certain types of arguments, allows automatic
syntax help generation for commands with arguments, and adds command
arguments into command options help correctly.
Currently only the breakpoint-id and breakpoint-id-range arguments, in
the breakpoint commands, have been hooked up to use the new mechanism.
The next steps will be to fix the command options arguments to use
this mechanism, and to fix the rest of the regular command arguments
to use this mechanism. Most of the help text is currently missing or
dummy text; this will need to be filled in, and the existing argument
help text will need to be cleaned up a bit (it was thrown in quickly,
mostly for testing purposes).
Help command now works for all argument types, although the help may not
be very helpful yet.
Those commands that take "raw" command strings now indicate it in their
help text.
llvm-svn: 115318
2010-10-02 01:46:38 +08:00
|
|
|
if (pos->second->WantsRawCommandString()) {
|
2020-01-29 03:23:46 +08:00
|
|
|
std::string help_text(std::string(pos->second->GetHelp()));
|
2016-07-15 06:03:10 +08:00
|
|
|
help_text.append(" Expects 'raw' input (see 'help raw-input'.)");
|
2013-06-12 09:50:57 +08:00
|
|
|
m_interpreter.OutputFormattedHelpText(output_stream,
|
Add infrastructure for standardizing arguments for commands and
command options; makes it easier to ensure that the same type of
argument will have the same name everywhere, hooks up help for command
arguments, so that users can ask for help when they are confused about
what an argument should be; puts in the beginnings of the ability to
do tab-completion for certain types of arguments, allows automatic
syntax help generation for commands with arguments, and adds command
arguments into command options help correctly.
Currently only the breakpoint-id and breakpoint-id-range arguments, in
the breakpoint commands, have been hooked up to use the new mechanism.
The next steps will be to fix the command options arguments to use
this mechanism, and to fix the rest of the regular command arguments
to use this mechanism. Most of the help text is currently missing or
dummy text; this will need to be filled in, and the existing argument
help text will need to be cleaned up a bit (it was thrown in quickly,
mostly for testing purposes).
Help command now works for all argument types, although the help may not
be very helpful yet.
Those commands that take "raw" command strings now indicate it in their
help text.
llvm-svn: 115318
2010-10-02 01:46:38 +08:00
|
|
|
indented_command.c_str(), "--",
|
|
|
|
help_text.c_str(), max_len);
|
|
|
|
} else
|
2013-06-12 09:50:57 +08:00
|
|
|
m_interpreter.OutputFormattedHelpText(output_stream,
|
Add infrastructure for standardizing arguments for commands and
command options; makes it easier to ensure that the same type of
argument will have the same name everywhere, hooks up help for command
arguments, so that users can ask for help when they are confused about
what an argument should be; puts in the beginnings of the ability to
do tab-completion for certain types of arguments, allows automatic
syntax help generation for commands with arguments, and adds command
arguments into command options help correctly.
Currently only the breakpoint-id and breakpoint-id-range arguments, in
the breakpoint commands, have been hooked up to use the new mechanism.
The next steps will be to fix the command options arguments to use
this mechanism, and to fix the rest of the regular command arguments
to use this mechanism. Most of the help text is currently missing or
dummy text; this will need to be filled in, and the existing argument
help text will need to be cleaned up a bit (it was thrown in quickly,
mostly for testing purposes).
Help command now works for all argument types, although the help may not
be very helpful yet.
Those commands that take "raw" command strings now indicate it in their
help text.
llvm-svn: 115318
2010-10-02 01:46:38 +08:00
|
|
|
indented_command.c_str(), "--",
|
|
|
|
pos->second->GetHelp(), max_len);
|
2010-06-09 00:52:24 +08:00
|
|
|
}
|
2016-09-07 04:57:50 +08:00
|
|
|
|
2010-06-09 00:52:24 +08:00
|
|
|
output_stream.PutCString("\nFor more help on any particular subcommand, type "
|
|
|
|
"'help <command> <subcommand>'.\n");
|
|
|
|
}
|
|
|
|
|
[lldb][NFC] Remove WordComplete mode, make result array indexed from 0 and remove any undocumented/redundant return values
Summary:
We still have some leftovers of the old completion API in the internals of
LLDB that haven't been replaced by the new CompletionRequest. These leftovers
are:
* The return values (int/size_t) in all completion functions.
* Our result array that starts indexing at 1.
* `WordComplete` mode.
I didn't replace them back then because it's tricky to figure out what exactly they
are used for and the completion code is relatively untested. I finally got around
to writing more tests for the API and understanding the semantics, so I think it's
a good time to get rid of them.
A few words why those things should be removed/replaced:
* The return values are really cryptic, partly redundant and rarely documented.
They are also completely ignored by Xcode, so whatever information they contain will end up
breaking Xcode's completion mechanism. They are also partly impossible to even implement
as we assign negative values special meaning and our completion API sometimes returns size_t.
Completion functions are supposed to return -2 to rewrite the current line. We seem to use this
in some untested code path to expand the history repeat character to the full command, but
I haven't figured out why that doesn't work at the moment.
Completion functions return -1 to 'insert the completion character', but that isn't implemented
(even though we seem to activate this feature in LLDB sometimes).
All positive values have to match the number of results. This is obviously just redundant information
as the user can just look at the result list to get that information (which is what Xcode does).
* The result array that starts indexing at 1 is obviously unexpected. The first element of the array is
reserved for the common prefix of all completions (e.g. "foobar" and "footar" -> "foo"). The idea is
that we calculate this to make the life of the API caller easier, but obviously forcing people to have
1-based indices is not helpful (or even worse, forces them to manually copy the results to make it
0-based like Xcode has to do).
* The `WordComplete` mode indicates that LLDB should enter a space behind the completion. The
idea is that we let the top-level API know that we just provided a full completion. Interestingly we
`WordComplete` is just a single bool that somehow represents all N completions. And we always
provide full completions in LLDB, so in theory it should always be true.
The only use it currently serves is providing redundant information about whether we have a single
definitive completion or not (which we already know from the number of results we get).
This patch essentially removes `WordComplete` mode and makes the result array indexed from 0.
It also removes all return values from all internal completion functions. The only non-redundant information
they contain is about rewriting the current line (which is broken), so that functionality was moved
to the CompletionRequest API. So you can now do `addCompletion("blub", "description", CompletionMode::RewriteLine)`
to do the same.
For the SB API we emulate the old behaviour by making the array indexed from 1 again with the common
prefix at index 0. I didn't keep the special negative return codes as we either never sent them before (e.g. -2) or we
didn't even implement them in the Editline handler (e.g. -1).
I tried to keep this patch minimal and I'm aware we can probably now even further simplify a bunch of related code,
but I would prefer doing this in follow-up NFC commits
Reviewers: JDevlieghere
Reviewed By: JDevlieghere
Subscribers: arphaman, abidh, lldb-commits
Tags: #lldb
Differential Revision: https://reviews.llvm.org/D66536
llvm-svn: 369624
2019-08-22 15:41:23 +08:00
|
|
|
void CommandObjectMultiword::HandleCompletion(CompletionRequest &request) {
|
2019-09-13 19:26:48 +08:00
|
|
|
auto arg0 = request.GetParsedLine()[0].ref();
|
Refactoring for for the internal command line completion API (NFC)
Summary:
This patch refactors the internal completion API. It now takes (as far as possible) a single
CompletionRequest object instead o half a dozen in/out/in-out parameters. The CompletionRequest
contains a common superset of the different parameters as far as it makes sense. This includes
the raw command line string and raw cursor position, which should make the `expr` command
possible to implement (at least without hacks that reconstruct the command line from the args).
This patch is not intended to change the observable behavior of lldb in any way. It's also as
minimal as possible and doesn't attempt to fix all the problems the API has.
Some Q&A:
Q: Why is this not fixing all the problems in the completion API?
A: Because is a blocker for the expr command completion which I want to get in ASAP. This is the
smallest patch that unblocks the expr completion patch and which allows trivial refactoring in the future.
The patch also doesn't really change the internal information flow in the API, so that hopefully
saves us from ever having to revert and resubmit this humongous patch.
Q: Can we merge all the copy-pasted code in the completion methods
(like computing the current incomplete arg) into CompletionRequest class?
A: Yes, but it's out of scope for this patch.
Q: Why the `word_complete = request.GetWordComplete(); ... ` pattern?
A: I don't want to add a getter that returns a reference to the internal integer. So we have
to use a temporary variable and the Getter/Setter instead. We don't throw exceptions
from what I can tell, so the behavior doesn't change.
Q: Why are we not owning the list of matches?
A: Because that's how the previous API works. But that should be fixed too (in another patch).
Q: Can we make the constructor simpler and compute some of the values from the plain command?
A: I think this works, but I rather want to have this in a follow up commit. Especially when making nested
request it's a bit awkward that the parsed arguments behave as both input/output (as we should in theory
propagate the changes on the nested request back to the parent request if we don't want to change the
behavior too much).
Q: Can't we pass one const request object and then just return another result object instead of mixing
them together in one in/out parameter?
A: It's hard to get keep the same behavior with that pattern, but I think we can also get a nice API with just
a single request object. If we make all input parameters read-only, we have a clear separation between what
is actually an input and what an output parameter (and hopefully we get rid of the in-out parameters).
Q: Can we throw out the 'match' variables that are not implemented according to the comment?
A: We currently just forward them as in the old code to the different methods, even though I think
they are really not used. We can easily remove and readd them once every single completion method just
takes a CompletionRequest, but for now I prefer NFC behavior from the perspective of the API user.
Reviewers: davide, jingham, labath
Reviewed By: jingham
Subscribers: mgorny, friss, lldb-commits
Differential Revision: https://reviews.llvm.org/D48796
llvm-svn: 336146
2018-07-03 05:29:56 +08:00
|
|
|
if (request.GetCursorIndex() == 0) {
|
2018-09-14 05:26:00 +08:00
|
|
|
StringList new_matches, descriptions;
|
|
|
|
AddNamesMatchingPartialString(m_subcommand_dict, arg0, new_matches,
|
|
|
|
&descriptions);
|
|
|
|
request.AddCompletions(new_matches, descriptions);
|
2016-09-07 04:57:50 +08:00
|
|
|
|
2018-07-28 02:42:46 +08:00
|
|
|
if (new_matches.GetSize() == 1 &&
|
|
|
|
new_matches.GetStringAtIndex(0) != nullptr &&
|
|
|
|
(arg0 == new_matches.GetStringAtIndex(0))) {
|
2010-06-09 00:52:24 +08:00
|
|
|
StringList temp_matches;
|
2013-12-11 03:14:04 +08:00
|
|
|
CommandObject *cmd_obj = GetSubcommandObject(arg0, &temp_matches);
|
2016-02-20 08:58:29 +08:00
|
|
|
if (cmd_obj != nullptr) {
|
[lldb][NFC] Remove WordComplete mode, make result array indexed from 0 and remove any undocumented/redundant return values
Summary:
We still have some leftovers of the old completion API in the internals of
LLDB that haven't been replaced by the new CompletionRequest. These leftovers
are:
* The return values (int/size_t) in all completion functions.
* Our result array that starts indexing at 1.
* `WordComplete` mode.
I didn't replace them back then because it's tricky to figure out what exactly they
are used for and the completion code is relatively untested. I finally got around
to writing more tests for the API and understanding the semantics, so I think it's
a good time to get rid of them.
A few words why those things should be removed/replaced:
* The return values are really cryptic, partly redundant and rarely documented.
They are also completely ignored by Xcode, so whatever information they contain will end up
breaking Xcode's completion mechanism. They are also partly impossible to even implement
as we assign negative values special meaning and our completion API sometimes returns size_t.
Completion functions are supposed to return -2 to rewrite the current line. We seem to use this
in some untested code path to expand the history repeat character to the full command, but
I haven't figured out why that doesn't work at the moment.
Completion functions return -1 to 'insert the completion character', but that isn't implemented
(even though we seem to activate this feature in LLDB sometimes).
All positive values have to match the number of results. This is obviously just redundant information
as the user can just look at the result list to get that information (which is what Xcode does).
* The result array that starts indexing at 1 is obviously unexpected. The first element of the array is
reserved for the common prefix of all completions (e.g. "foobar" and "footar" -> "foo"). The idea is
that we calculate this to make the life of the API caller easier, but obviously forcing people to have
1-based indices is not helpful (or even worse, forces them to manually copy the results to make it
0-based like Xcode has to do).
* The `WordComplete` mode indicates that LLDB should enter a space behind the completion. The
idea is that we let the top-level API know that we just provided a full completion. Interestingly we
`WordComplete` is just a single bool that somehow represents all N completions. And we always
provide full completions in LLDB, so in theory it should always be true.
The only use it currently serves is providing redundant information about whether we have a single
definitive completion or not (which we already know from the number of results we get).
This patch essentially removes `WordComplete` mode and makes the result array indexed from 0.
It also removes all return values from all internal completion functions. The only non-redundant information
they contain is about rewriting the current line (which is broken), so that functionality was moved
to the CompletionRequest API. So you can now do `addCompletion("blub", "description", CompletionMode::RewriteLine)`
to do the same.
For the SB API we emulate the old behaviour by making the array indexed from 1 again with the common
prefix at index 0. I didn't keep the special negative return codes as we either never sent them before (e.g. -2) or we
didn't even implement them in the Editline handler (e.g. -1).
I tried to keep this patch minimal and I'm aware we can probably now even further simplify a bunch of related code,
but I would prefer doing this in follow-up NFC commits
Reviewers: JDevlieghere
Reviewed By: JDevlieghere
Subscribers: arphaman, abidh, lldb-commits
Tags: #lldb
Differential Revision: https://reviews.llvm.org/D66536
llvm-svn: 369624
2019-08-22 15:41:23 +08:00
|
|
|
if (request.GetParsedLine().GetArgumentCount() != 1) {
|
Refactoring for for the internal command line completion API (NFC)
Summary:
This patch refactors the internal completion API. It now takes (as far as possible) a single
CompletionRequest object instead o half a dozen in/out/in-out parameters. The CompletionRequest
contains a common superset of the different parameters as far as it makes sense. This includes
the raw command line string and raw cursor position, which should make the `expr` command
possible to implement (at least without hacks that reconstruct the command line from the args).
This patch is not intended to change the observable behavior of lldb in any way. It's also as
minimal as possible and doesn't attempt to fix all the problems the API has.
Some Q&A:
Q: Why is this not fixing all the problems in the completion API?
A: Because is a blocker for the expr command completion which I want to get in ASAP. This is the
smallest patch that unblocks the expr completion patch and which allows trivial refactoring in the future.
The patch also doesn't really change the internal information flow in the API, so that hopefully
saves us from ever having to revert and resubmit this humongous patch.
Q: Can we merge all the copy-pasted code in the completion methods
(like computing the current incomplete arg) into CompletionRequest class?
A: Yes, but it's out of scope for this patch.
Q: Why the `word_complete = request.GetWordComplete(); ... ` pattern?
A: I don't want to add a getter that returns a reference to the internal integer. So we have
to use a temporary variable and the Getter/Setter instead. We don't throw exceptions
from what I can tell, so the behavior doesn't change.
Q: Why are we not owning the list of matches?
A: Because that's how the previous API works. But that should be fixed too (in another patch).
Q: Can we make the constructor simpler and compute some of the values from the plain command?
A: I think this works, but I rather want to have this in a follow up commit. Especially when making nested
request it's a bit awkward that the parsed arguments behave as both input/output (as we should in theory
propagate the changes on the nested request back to the parent request if we don't want to change the
behavior too much).
Q: Can't we pass one const request object and then just return another result object instead of mixing
them together in one in/out parameter?
A: It's hard to get keep the same behavior with that pattern, but I think we can also get a nice API with just
a single request object. If we make all input parameters read-only, we have a clear separation between what
is actually an input and what an output parameter (and hopefully we get rid of the in-out parameters).
Q: Can we throw out the 'match' variables that are not implemented according to the comment?
A: We currently just forward them as in the old code to the different methods, even though I think
they are really not used. We can easily remove and readd them once every single completion method just
takes a CompletionRequest, but for now I prefer NFC behavior from the perspective of the API user.
Reviewers: davide, jingham, labath
Reviewed By: jingham
Subscribers: mgorny, friss, lldb-commits
Differential Revision: https://reviews.llvm.org/D48796
llvm-svn: 336146
2018-07-03 05:29:56 +08:00
|
|
|
request.GetParsedLine().Shift();
|
2019-09-25 20:40:01 +08:00
|
|
|
request.AppendEmptyArgument();
|
[lldb][NFC] Remove WordComplete mode, make result array indexed from 0 and remove any undocumented/redundant return values
Summary:
We still have some leftovers of the old completion API in the internals of
LLDB that haven't been replaced by the new CompletionRequest. These leftovers
are:
* The return values (int/size_t) in all completion functions.
* Our result array that starts indexing at 1.
* `WordComplete` mode.
I didn't replace them back then because it's tricky to figure out what exactly they
are used for and the completion code is relatively untested. I finally got around
to writing more tests for the API and understanding the semantics, so I think it's
a good time to get rid of them.
A few words why those things should be removed/replaced:
* The return values are really cryptic, partly redundant and rarely documented.
They are also completely ignored by Xcode, so whatever information they contain will end up
breaking Xcode's completion mechanism. They are also partly impossible to even implement
as we assign negative values special meaning and our completion API sometimes returns size_t.
Completion functions are supposed to return -2 to rewrite the current line. We seem to use this
in some untested code path to expand the history repeat character to the full command, but
I haven't figured out why that doesn't work at the moment.
Completion functions return -1 to 'insert the completion character', but that isn't implemented
(even though we seem to activate this feature in LLDB sometimes).
All positive values have to match the number of results. This is obviously just redundant information
as the user can just look at the result list to get that information (which is what Xcode does).
* The result array that starts indexing at 1 is obviously unexpected. The first element of the array is
reserved for the common prefix of all completions (e.g. "foobar" and "footar" -> "foo"). The idea is
that we calculate this to make the life of the API caller easier, but obviously forcing people to have
1-based indices is not helpful (or even worse, forces them to manually copy the results to make it
0-based like Xcode has to do).
* The `WordComplete` mode indicates that LLDB should enter a space behind the completion. The
idea is that we let the top-level API know that we just provided a full completion. Interestingly we
`WordComplete` is just a single bool that somehow represents all N completions. And we always
provide full completions in LLDB, so in theory it should always be true.
The only use it currently serves is providing redundant information about whether we have a single
definitive completion or not (which we already know from the number of results we get).
This patch essentially removes `WordComplete` mode and makes the result array indexed from 0.
It also removes all return values from all internal completion functions. The only non-redundant information
they contain is about rewriting the current line (which is broken), so that functionality was moved
to the CompletionRequest API. So you can now do `addCompletion("blub", "description", CompletionMode::RewriteLine)`
to do the same.
For the SB API we emulate the old behaviour by making the array indexed from 1 again with the common
prefix at index 0. I didn't keep the special negative return codes as we either never sent them before (e.g. -2) or we
didn't even implement them in the Editline handler (e.g. -1).
I tried to keep this patch minimal and I'm aware we can probably now even further simplify a bunch of related code,
but I would prefer doing this in follow-up NFC commits
Reviewers: JDevlieghere
Reviewed By: JDevlieghere
Subscribers: arphaman, abidh, lldb-commits
Tags: #lldb
Differential Revision: https://reviews.llvm.org/D66536
llvm-svn: 369624
2019-08-22 15:41:23 +08:00
|
|
|
cmd_obj->HandleCompletion(request);
|
2010-06-09 00:52:24 +08:00
|
|
|
}
|
2016-09-07 04:57:50 +08:00
|
|
|
}
|
2010-06-09 00:52:24 +08:00
|
|
|
}
|
2019-08-22 17:02:54 +08:00
|
|
|
return;
|
2016-09-07 04:57:50 +08:00
|
|
|
}
|
2019-08-22 17:02:54 +08:00
|
|
|
|
|
|
|
StringList new_matches;
|
|
|
|
CommandObject *sub_command_object = GetSubcommandObject(arg0, &new_matches);
|
|
|
|
if (sub_command_object == nullptr) {
|
|
|
|
request.AddCompletions(new_matches);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Remove the one match that we got from calling GetSubcommandObject.
|
|
|
|
new_matches.DeleteStringAtIndex(0);
|
|
|
|
request.AddCompletions(new_matches);
|
2019-09-23 16:16:19 +08:00
|
|
|
request.ShiftArguments();
|
2019-08-22 17:02:54 +08:00
|
|
|
sub_command_object->HandleCompletion(request);
|
2010-06-09 00:52:24 +08:00
|
|
|
}
|
|
|
|
|
2010-07-07 11:36:20 +08:00
|
|
|
const char *CommandObjectMultiword::GetRepeatCommand(Args ¤t_command_args,
|
|
|
|
uint32_t index) {
|
|
|
|
index++;
|
2010-07-21 06:54:09 +08:00
|
|
|
if (current_command_args.GetArgumentCount() <= index)
|
2016-02-20 08:58:29 +08:00
|
|
|
return nullptr;
|
2010-07-07 11:36:20 +08:00
|
|
|
CommandObject *sub_command_object =
|
2019-09-13 19:26:48 +08:00
|
|
|
GetSubcommandObject(current_command_args[index].ref());
|
2016-02-20 08:58:29 +08:00
|
|
|
if (sub_command_object == nullptr)
|
|
|
|
return nullptr;
|
2010-07-07 11:36:20 +08:00
|
|
|
return sub_command_object->GetRepeatCommand(current_command_args, index);
|
|
|
|
}
|
|
|
|
|
2016-11-13 10:50:32 +08:00
|
|
|
void CommandObjectMultiword::AproposAllSubCommands(llvm::StringRef prefix,
|
|
|
|
llvm::StringRef search_word,
|
2012-10-13 10:07:45 +08:00
|
|
|
StringList &commands_found,
|
|
|
|
StringList &commands_help) {
|
|
|
|
CommandObject::CommandMap::const_iterator pos;
|
2016-09-07 04:57:50 +08:00
|
|
|
|
2012-10-13 10:07:45 +08:00
|
|
|
for (pos = m_subcommand_dict.begin(); pos != m_subcommand_dict.end(); ++pos) {
|
|
|
|
const char *command_name = pos->first.c_str();
|
|
|
|
CommandObject *sub_cmd_obj = pos->second.get();
|
|
|
|
StreamString complete_command_name;
|
2016-09-07 04:57:50 +08:00
|
|
|
|
2016-11-15 07:23:31 +08:00
|
|
|
complete_command_name << prefix << " " << command_name;
|
2016-09-07 04:57:50 +08:00
|
|
|
|
2012-10-13 10:07:45 +08:00
|
|
|
if (sub_cmd_obj->HelpTextContainsWord(search_word)) {
|
2016-11-17 05:15:24 +08:00
|
|
|
commands_found.AppendString(complete_command_name.GetString());
|
2012-10-13 10:07:45 +08:00
|
|
|
commands_help.AppendString(sub_cmd_obj->GetHelp());
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sub_cmd_obj->IsMultiwordObject())
|
2016-11-13 10:50:32 +08:00
|
|
|
sub_cmd_obj->AproposAllSubCommands(complete_command_name.GetString(),
|
2012-10-13 10:07:45 +08:00
|
|
|
search_word, commands_found,
|
|
|
|
commands_help);
|
2016-09-07 04:57:50 +08:00
|
|
|
}
|
2012-10-13 10:07:45 +08:00
|
|
|
}
|
|
|
|
|
2016-02-20 08:58:29 +08:00
|
|
|
CommandObjectProxy::CommandObjectProxy(CommandInterpreter &interpreter,
|
2012-10-13 10:07:45 +08:00
|
|
|
const char *name, const char *help,
|
2016-02-20 08:58:29 +08:00
|
|
|
const char *syntax, uint32_t flags)
|
2012-10-13 10:07:45 +08:00
|
|
|
: CommandObject(interpreter, name, help, syntax, flags) {}
|
2016-09-07 04:57:50 +08:00
|
|
|
|
2016-02-20 08:58:29 +08:00
|
|
|
CommandObjectProxy::~CommandObjectProxy() = default;
|
2012-10-13 10:07:45 +08:00
|
|
|
|
2016-11-13 04:41:02 +08:00
|
|
|
llvm::StringRef CommandObjectProxy::GetHelpLong() {
|
2012-10-13 10:07:45 +08:00
|
|
|
CommandObject *proxy_command = GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
|
|
|
return proxy_command->GetHelpLong();
|
2016-11-13 04:41:02 +08:00
|
|
|
return llvm::StringRef();
|
2012-10-13 10:07:45 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
bool CommandObjectProxy::IsRemovable() const {
|
|
|
|
const CommandObject *proxy_command =
|
|
|
|
const_cast<CommandObjectProxy *>(this)->GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
|
|
|
return proxy_command->IsRemovable();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool CommandObjectProxy::IsMultiwordObject() {
|
|
|
|
CommandObject *proxy_command = GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
|
|
|
return proxy_command->IsMultiwordObject();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-04-21 04:48:05 +08:00
|
|
|
CommandObjectMultiword *CommandObjectProxy::GetAsMultiwordCommand() {
|
|
|
|
CommandObject *proxy_command = GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
|
|
|
return proxy_command->GetAsMultiwordCommand();
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
2015-11-05 09:18:07 +08:00
|
|
|
void CommandObjectProxy::GenerateHelpText(Stream &result) {
|
|
|
|
CommandObject *proxy_command = GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
|
|
|
return proxy_command->GenerateHelpText(result);
|
|
|
|
}
|
|
|
|
|
2016-11-13 10:50:32 +08:00
|
|
|
lldb::CommandObjectSP
|
|
|
|
CommandObjectProxy::GetSubcommandSP(llvm::StringRef sub_cmd,
|
|
|
|
StringList *matches) {
|
2012-10-13 10:07:45 +08:00
|
|
|
CommandObject *proxy_command = GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
|
|
|
return proxy_command->GetSubcommandSP(sub_cmd, matches);
|
|
|
|
return lldb::CommandObjectSP();
|
|
|
|
}
|
|
|
|
|
2016-11-13 10:50:32 +08:00
|
|
|
CommandObject *CommandObjectProxy::GetSubcommandObject(llvm::StringRef sub_cmd,
|
2012-10-13 10:07:45 +08:00
|
|
|
StringList *matches) {
|
|
|
|
CommandObject *proxy_command = GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
|
|
|
return proxy_command->GetSubcommandObject(sub_cmd, matches);
|
2016-02-20 08:58:29 +08:00
|
|
|
return nullptr;
|
2012-10-13 10:07:45 +08:00
|
|
|
}
|
|
|
|
|
2016-11-13 10:50:32 +08:00
|
|
|
void CommandObjectProxy::AproposAllSubCommands(llvm::StringRef prefix,
|
|
|
|
llvm::StringRef search_word,
|
2012-10-13 10:07:45 +08:00
|
|
|
StringList &commands_found,
|
|
|
|
StringList &commands_help) {
|
|
|
|
CommandObject *proxy_command = GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
|
|
|
return proxy_command->AproposAllSubCommands(prefix, search_word,
|
|
|
|
commands_found, commands_help);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool CommandObjectProxy::LoadSubCommand(
|
2016-11-13 10:50:32 +08:00
|
|
|
llvm::StringRef cmd_name, const lldb::CommandObjectSP &command_sp) {
|
2012-10-13 10:07:45 +08:00
|
|
|
CommandObject *proxy_command = GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
|
|
|
return proxy_command->LoadSubCommand(cmd_name, command_sp);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool CommandObjectProxy::WantsRawCommandString() {
|
|
|
|
CommandObject *proxy_command = GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
|
|
|
return proxy_command->WantsRawCommandString();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool CommandObjectProxy::WantsCompletion() {
|
|
|
|
CommandObject *proxy_command = GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
|
|
|
return proxy_command->WantsCompletion();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
Options *CommandObjectProxy::GetOptions() {
|
|
|
|
CommandObject *proxy_command = GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
|
|
|
return proxy_command->GetOptions();
|
2016-02-20 08:58:29 +08:00
|
|
|
return nullptr;
|
2012-10-13 10:07:45 +08:00
|
|
|
}
|
|
|
|
|
[lldb][NFC] Remove WordComplete mode, make result array indexed from 0 and remove any undocumented/redundant return values
Summary:
We still have some leftovers of the old completion API in the internals of
LLDB that haven't been replaced by the new CompletionRequest. These leftovers
are:
* The return values (int/size_t) in all completion functions.
* Our result array that starts indexing at 1.
* `WordComplete` mode.
I didn't replace them back then because it's tricky to figure out what exactly they
are used for and the completion code is relatively untested. I finally got around
to writing more tests for the API and understanding the semantics, so I think it's
a good time to get rid of them.
A few words why those things should be removed/replaced:
* The return values are really cryptic, partly redundant and rarely documented.
They are also completely ignored by Xcode, so whatever information they contain will end up
breaking Xcode's completion mechanism. They are also partly impossible to even implement
as we assign negative values special meaning and our completion API sometimes returns size_t.
Completion functions are supposed to return -2 to rewrite the current line. We seem to use this
in some untested code path to expand the history repeat character to the full command, but
I haven't figured out why that doesn't work at the moment.
Completion functions return -1 to 'insert the completion character', but that isn't implemented
(even though we seem to activate this feature in LLDB sometimes).
All positive values have to match the number of results. This is obviously just redundant information
as the user can just look at the result list to get that information (which is what Xcode does).
* The result array that starts indexing at 1 is obviously unexpected. The first element of the array is
reserved for the common prefix of all completions (e.g. "foobar" and "footar" -> "foo"). The idea is
that we calculate this to make the life of the API caller easier, but obviously forcing people to have
1-based indices is not helpful (or even worse, forces them to manually copy the results to make it
0-based like Xcode has to do).
* The `WordComplete` mode indicates that LLDB should enter a space behind the completion. The
idea is that we let the top-level API know that we just provided a full completion. Interestingly we
`WordComplete` is just a single bool that somehow represents all N completions. And we always
provide full completions in LLDB, so in theory it should always be true.
The only use it currently serves is providing redundant information about whether we have a single
definitive completion or not (which we already know from the number of results we get).
This patch essentially removes `WordComplete` mode and makes the result array indexed from 0.
It also removes all return values from all internal completion functions. The only non-redundant information
they contain is about rewriting the current line (which is broken), so that functionality was moved
to the CompletionRequest API. So you can now do `addCompletion("blub", "description", CompletionMode::RewriteLine)`
to do the same.
For the SB API we emulate the old behaviour by making the array indexed from 1 again with the common
prefix at index 0. I didn't keep the special negative return codes as we either never sent them before (e.g. -2) or we
didn't even implement them in the Editline handler (e.g. -1).
I tried to keep this patch minimal and I'm aware we can probably now even further simplify a bunch of related code,
but I would prefer doing this in follow-up NFC commits
Reviewers: JDevlieghere
Reviewed By: JDevlieghere
Subscribers: arphaman, abidh, lldb-commits
Tags: #lldb
Differential Revision: https://reviews.llvm.org/D66536
llvm-svn: 369624
2019-08-22 15:41:23 +08:00
|
|
|
void CommandObjectProxy::HandleCompletion(CompletionRequest &request) {
|
2012-10-13 10:07:45 +08:00
|
|
|
CommandObject *proxy_command = GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
[lldb][NFC] Remove WordComplete mode, make result array indexed from 0 and remove any undocumented/redundant return values
Summary:
We still have some leftovers of the old completion API in the internals of
LLDB that haven't been replaced by the new CompletionRequest. These leftovers
are:
* The return values (int/size_t) in all completion functions.
* Our result array that starts indexing at 1.
* `WordComplete` mode.
I didn't replace them back then because it's tricky to figure out what exactly they
are used for and the completion code is relatively untested. I finally got around
to writing more tests for the API and understanding the semantics, so I think it's
a good time to get rid of them.
A few words why those things should be removed/replaced:
* The return values are really cryptic, partly redundant and rarely documented.
They are also completely ignored by Xcode, so whatever information they contain will end up
breaking Xcode's completion mechanism. They are also partly impossible to even implement
as we assign negative values special meaning and our completion API sometimes returns size_t.
Completion functions are supposed to return -2 to rewrite the current line. We seem to use this
in some untested code path to expand the history repeat character to the full command, but
I haven't figured out why that doesn't work at the moment.
Completion functions return -1 to 'insert the completion character', but that isn't implemented
(even though we seem to activate this feature in LLDB sometimes).
All positive values have to match the number of results. This is obviously just redundant information
as the user can just look at the result list to get that information (which is what Xcode does).
* The result array that starts indexing at 1 is obviously unexpected. The first element of the array is
reserved for the common prefix of all completions (e.g. "foobar" and "footar" -> "foo"). The idea is
that we calculate this to make the life of the API caller easier, but obviously forcing people to have
1-based indices is not helpful (or even worse, forces them to manually copy the results to make it
0-based like Xcode has to do).
* The `WordComplete` mode indicates that LLDB should enter a space behind the completion. The
idea is that we let the top-level API know that we just provided a full completion. Interestingly we
`WordComplete` is just a single bool that somehow represents all N completions. And we always
provide full completions in LLDB, so in theory it should always be true.
The only use it currently serves is providing redundant information about whether we have a single
definitive completion or not (which we already know from the number of results we get).
This patch essentially removes `WordComplete` mode and makes the result array indexed from 0.
It also removes all return values from all internal completion functions. The only non-redundant information
they contain is about rewriting the current line (which is broken), so that functionality was moved
to the CompletionRequest API. So you can now do `addCompletion("blub", "description", CompletionMode::RewriteLine)`
to do the same.
For the SB API we emulate the old behaviour by making the array indexed from 1 again with the common
prefix at index 0. I didn't keep the special negative return codes as we either never sent them before (e.g. -2) or we
didn't even implement them in the Editline handler (e.g. -1).
I tried to keep this patch minimal and I'm aware we can probably now even further simplify a bunch of related code,
but I would prefer doing this in follow-up NFC commits
Reviewers: JDevlieghere
Reviewed By: JDevlieghere
Subscribers: arphaman, abidh, lldb-commits
Tags: #lldb
Differential Revision: https://reviews.llvm.org/D66536
llvm-svn: 369624
2019-08-22 15:41:23 +08:00
|
|
|
proxy_command->HandleCompletion(request);
|
2012-10-13 10:07:45 +08:00
|
|
|
}
|
2016-02-20 08:58:29 +08:00
|
|
|
|
[lldb][NFC] Remove WordComplete mode, make result array indexed from 0 and remove any undocumented/redundant return values
Summary:
We still have some leftovers of the old completion API in the internals of
LLDB that haven't been replaced by the new CompletionRequest. These leftovers
are:
* The return values (int/size_t) in all completion functions.
* Our result array that starts indexing at 1.
* `WordComplete` mode.
I didn't replace them back then because it's tricky to figure out what exactly they
are used for and the completion code is relatively untested. I finally got around
to writing more tests for the API and understanding the semantics, so I think it's
a good time to get rid of them.
A few words why those things should be removed/replaced:
* The return values are really cryptic, partly redundant and rarely documented.
They are also completely ignored by Xcode, so whatever information they contain will end up
breaking Xcode's completion mechanism. They are also partly impossible to even implement
as we assign negative values special meaning and our completion API sometimes returns size_t.
Completion functions are supposed to return -2 to rewrite the current line. We seem to use this
in some untested code path to expand the history repeat character to the full command, but
I haven't figured out why that doesn't work at the moment.
Completion functions return -1 to 'insert the completion character', but that isn't implemented
(even though we seem to activate this feature in LLDB sometimes).
All positive values have to match the number of results. This is obviously just redundant information
as the user can just look at the result list to get that information (which is what Xcode does).
* The result array that starts indexing at 1 is obviously unexpected. The first element of the array is
reserved for the common prefix of all completions (e.g. "foobar" and "footar" -> "foo"). The idea is
that we calculate this to make the life of the API caller easier, but obviously forcing people to have
1-based indices is not helpful (or even worse, forces them to manually copy the results to make it
0-based like Xcode has to do).
* The `WordComplete` mode indicates that LLDB should enter a space behind the completion. The
idea is that we let the top-level API know that we just provided a full completion. Interestingly we
`WordComplete` is just a single bool that somehow represents all N completions. And we always
provide full completions in LLDB, so in theory it should always be true.
The only use it currently serves is providing redundant information about whether we have a single
definitive completion or not (which we already know from the number of results we get).
This patch essentially removes `WordComplete` mode and makes the result array indexed from 0.
It also removes all return values from all internal completion functions. The only non-redundant information
they contain is about rewriting the current line (which is broken), so that functionality was moved
to the CompletionRequest API. So you can now do `addCompletion("blub", "description", CompletionMode::RewriteLine)`
to do the same.
For the SB API we emulate the old behaviour by making the array indexed from 1 again with the common
prefix at index 0. I didn't keep the special negative return codes as we either never sent them before (e.g. -2) or we
didn't even implement them in the Editline handler (e.g. -1).
I tried to keep this patch minimal and I'm aware we can probably now even further simplify a bunch of related code,
but I would prefer doing this in follow-up NFC commits
Reviewers: JDevlieghere
Reviewed By: JDevlieghere
Subscribers: arphaman, abidh, lldb-commits
Tags: #lldb
Differential Revision: https://reviews.llvm.org/D66536
llvm-svn: 369624
2019-08-22 15:41:23 +08:00
|
|
|
void CommandObjectProxy::HandleArgumentCompletion(
|
Refactoring for for the internal command line completion API (NFC)
Summary:
This patch refactors the internal completion API. It now takes (as far as possible) a single
CompletionRequest object instead o half a dozen in/out/in-out parameters. The CompletionRequest
contains a common superset of the different parameters as far as it makes sense. This includes
the raw command line string and raw cursor position, which should make the `expr` command
possible to implement (at least without hacks that reconstruct the command line from the args).
This patch is not intended to change the observable behavior of lldb in any way. It's also as
minimal as possible and doesn't attempt to fix all the problems the API has.
Some Q&A:
Q: Why is this not fixing all the problems in the completion API?
A: Because is a blocker for the expr command completion which I want to get in ASAP. This is the
smallest patch that unblocks the expr completion patch and which allows trivial refactoring in the future.
The patch also doesn't really change the internal information flow in the API, so that hopefully
saves us from ever having to revert and resubmit this humongous patch.
Q: Can we merge all the copy-pasted code in the completion methods
(like computing the current incomplete arg) into CompletionRequest class?
A: Yes, but it's out of scope for this patch.
Q: Why the `word_complete = request.GetWordComplete(); ... ` pattern?
A: I don't want to add a getter that returns a reference to the internal integer. So we have
to use a temporary variable and the Getter/Setter instead. We don't throw exceptions
from what I can tell, so the behavior doesn't change.
Q: Why are we not owning the list of matches?
A: Because that's how the previous API works. But that should be fixed too (in another patch).
Q: Can we make the constructor simpler and compute some of the values from the plain command?
A: I think this works, but I rather want to have this in a follow up commit. Especially when making nested
request it's a bit awkward that the parsed arguments behave as both input/output (as we should in theory
propagate the changes on the nested request back to the parent request if we don't want to change the
behavior too much).
Q: Can't we pass one const request object and then just return another result object instead of mixing
them together in one in/out parameter?
A: It's hard to get keep the same behavior with that pattern, but I think we can also get a nice API with just
a single request object. If we make all input parameters read-only, we have a clear separation between what
is actually an input and what an output parameter (and hopefully we get rid of the in-out parameters).
Q: Can we throw out the 'match' variables that are not implemented according to the comment?
A: We currently just forward them as in the old code to the different methods, even though I think
they are really not used. We can easily remove and readd them once every single completion method just
takes a CompletionRequest, but for now I prefer NFC behavior from the perspective of the API user.
Reviewers: davide, jingham, labath
Reviewed By: jingham
Subscribers: mgorny, friss, lldb-commits
Differential Revision: https://reviews.llvm.org/D48796
llvm-svn: 336146
2018-07-03 05:29:56 +08:00
|
|
|
CompletionRequest &request, OptionElementVector &opt_element_vector) {
|
2012-10-13 10:07:45 +08:00
|
|
|
CommandObject *proxy_command = GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
[lldb][NFC] Remove WordComplete mode, make result array indexed from 0 and remove any undocumented/redundant return values
Summary:
We still have some leftovers of the old completion API in the internals of
LLDB that haven't been replaced by the new CompletionRequest. These leftovers
are:
* The return values (int/size_t) in all completion functions.
* Our result array that starts indexing at 1.
* `WordComplete` mode.
I didn't replace them back then because it's tricky to figure out what exactly they
are used for and the completion code is relatively untested. I finally got around
to writing more tests for the API and understanding the semantics, so I think it's
a good time to get rid of them.
A few words why those things should be removed/replaced:
* The return values are really cryptic, partly redundant and rarely documented.
They are also completely ignored by Xcode, so whatever information they contain will end up
breaking Xcode's completion mechanism. They are also partly impossible to even implement
as we assign negative values special meaning and our completion API sometimes returns size_t.
Completion functions are supposed to return -2 to rewrite the current line. We seem to use this
in some untested code path to expand the history repeat character to the full command, but
I haven't figured out why that doesn't work at the moment.
Completion functions return -1 to 'insert the completion character', but that isn't implemented
(even though we seem to activate this feature in LLDB sometimes).
All positive values have to match the number of results. This is obviously just redundant information
as the user can just look at the result list to get that information (which is what Xcode does).
* The result array that starts indexing at 1 is obviously unexpected. The first element of the array is
reserved for the common prefix of all completions (e.g. "foobar" and "footar" -> "foo"). The idea is
that we calculate this to make the life of the API caller easier, but obviously forcing people to have
1-based indices is not helpful (or even worse, forces them to manually copy the results to make it
0-based like Xcode has to do).
* The `WordComplete` mode indicates that LLDB should enter a space behind the completion. The
idea is that we let the top-level API know that we just provided a full completion. Interestingly we
`WordComplete` is just a single bool that somehow represents all N completions. And we always
provide full completions in LLDB, so in theory it should always be true.
The only use it currently serves is providing redundant information about whether we have a single
definitive completion or not (which we already know from the number of results we get).
This patch essentially removes `WordComplete` mode and makes the result array indexed from 0.
It also removes all return values from all internal completion functions. The only non-redundant information
they contain is about rewriting the current line (which is broken), so that functionality was moved
to the CompletionRequest API. So you can now do `addCompletion("blub", "description", CompletionMode::RewriteLine)`
to do the same.
For the SB API we emulate the old behaviour by making the array indexed from 1 again with the common
prefix at index 0. I didn't keep the special negative return codes as we either never sent them before (e.g. -2) or we
didn't even implement them in the Editline handler (e.g. -1).
I tried to keep this patch minimal and I'm aware we can probably now even further simplify a bunch of related code,
but I would prefer doing this in follow-up NFC commits
Reviewers: JDevlieghere
Reviewed By: JDevlieghere
Subscribers: arphaman, abidh, lldb-commits
Tags: #lldb
Differential Revision: https://reviews.llvm.org/D66536
llvm-svn: 369624
2019-08-22 15:41:23 +08:00
|
|
|
proxy_command->HandleArgumentCompletion(request, opt_element_vector);
|
2012-10-13 10:07:45 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
const char *CommandObjectProxy::GetRepeatCommand(Args ¤t_command_args,
|
|
|
|
uint32_t index) {
|
|
|
|
CommandObject *proxy_command = GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
|
|
|
return proxy_command->GetRepeatCommand(current_command_args, index);
|
2016-02-20 08:58:29 +08:00
|
|
|
return nullptr;
|
2012-10-13 10:07:45 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
bool CommandObjectProxy::Execute(const char *args_string,
|
|
|
|
CommandReturnObject &result) {
|
|
|
|
CommandObject *proxy_command = GetProxyCommandObject();
|
|
|
|
if (proxy_command)
|
|
|
|
return proxy_command->Execute(args_string, result);
|
|
|
|
result.AppendError("command is not implemented");
|
|
|
|
result.SetStatus(eReturnStatusFailed);
|
|
|
|
return false;
|
|
|
|
}
|