diff options
| author | emaste <emaste@FreeBSD.org> | 2015-07-03 16:57:06 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2015-07-03 16:57:06 +0000 |
| commit | 8037fa4ee916fa20b3c63cbf531f4ee7e1c76138 (patch) | |
| tree | 3c2e41c3be19b7fc7666ed45a5f91ec3b6e35f2a /source/Commands/CommandObjectMultiword.cpp | |
| parent | d61b076ede88b56f3372a55e7d1eac6a9d717120 (diff) | |
| download | FreeBSD-src-8037fa4ee916fa20b3c63cbf531f4ee7e1c76138.zip FreeBSD-src-8037fa4ee916fa20b3c63cbf531f4ee7e1c76138.tar.gz | |
Import LLDB as of upstream SVN 241361 (git 612c075f)
Diffstat (limited to 'source/Commands/CommandObjectMultiword.cpp')
| -rw-r--r-- | source/Commands/CommandObjectMultiword.cpp | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/source/Commands/CommandObjectMultiword.cpp b/source/Commands/CommandObjectMultiword.cpp index 69b178d..2f0e2a7 100644 --- a/source/Commands/CommandObjectMultiword.cpp +++ b/source/Commands/CommandObjectMultiword.cpp @@ -7,8 +7,6 @@ // //===----------------------------------------------------------------------===// -#include "lldb/lldb-python.h" - #include "lldb/Interpreter/CommandObjectMultiword.h" // C Includes // C++ Includes @@ -153,7 +151,7 @@ CommandObjectMultiword::Execute(const char *args_string, CommandReturnObject &re error_msg.append (GetCommandName()); error_msg.append (" "); error_msg.append (sub_command); - error_msg.append ("'"); + error_msg.append ("'."); if (num_subcmd_matches > 0) { @@ -251,23 +249,27 @@ CommandObjectMultiword::HandleCompletion &temp_matches); if (cmd_obj != NULL) { - matches.DeleteStringAtIndex (0); - input.Shift(); - cursor_char_position = 0; - input.AppendArgument (""); - return cmd_obj->HandleCompletion (input, - cursor_index, - cursor_char_position, - match_start_point, - max_return_elements, - word_complete, - matches); + if (input.GetArgumentCount() == 1) + { + word_complete = true; + } + else + { + matches.DeleteStringAtIndex (0); + input.Shift(); + cursor_char_position = 0; + input.AppendArgument (""); + return cmd_obj->HandleCompletion (input, + cursor_index, + cursor_char_position, + match_start_point, + max_return_elements, + word_complete, + matches); + } } - else - return matches.GetSize(); } - else - return matches.GetSize(); + return matches.GetSize(); } else { |
