Index: lldb/include/lldb/Core/Debugger.h =================================================================== --- lldb/include/lldb/Core/Debugger.h +++ lldb/include/lldb/Core/Debugger.h @@ -273,6 +273,8 @@ bool SetUseColor(bool use_color); + bool GetUseAutosuggestion() const; + bool GetUseSourceCache() const; bool SetUseSourceCache(bool use_source_cache); Index: lldb/include/lldb/Core/IOHandler.h =================================================================== --- lldb/include/lldb/Core/IOHandler.h +++ lldb/include/lldb/Core/IOHandler.h @@ -202,6 +202,9 @@ virtual void IOHandlerDeactivated(IOHandler &io_handler) {} + virtual llvm::Optional IOHandlerSuggestion(IOHandler &io_handler, + llvm::StringRef line); + virtual void IOHandlerComplete(IOHandler &io_handler, CompletionRequest &request); @@ -419,6 +422,9 @@ static int FixIndentationCallback(Editline *editline, const StringList &lines, int cursor_position, void *baton); + static llvm::Optional SuggestionCallback(llvm::StringRef line, + void *baton); + static void AutoCompleteCallback(CompletionRequest &request, void *baton); #endif Index: lldb/include/lldb/Host/Editline.h =================================================================== --- lldb/include/lldb/Host/Editline.h +++ lldb/include/lldb/Host/Editline.h @@ -98,6 +98,9 @@ const StringList &lines, int cursor_position, void *baton); +typedef llvm::Optional (*SuggestionCallbackType)( + llvm::StringRef line, void *baton); + typedef void (*CompleteCallbackType)(CompletionRequest &request, void *baton); /// Status used to decide when and how to start editing another line in @@ -184,6 +187,9 @@ /// Cancel this edit and oblitarate all trace of it bool Cancel(); + /// Register a callback for autosuggestion. + void SetSuggestionCallback(SuggestionCallbackType callback, void *baton); + /// Register a callback for the tab key void SetAutoCompleteCallback(CompleteCallbackType callback, void *baton); @@ -206,6 +212,8 @@ void PrintAsync(Stream *stream, const char *s, size_t len); + std::vector AddHistories(); + private: /// Sets the lowest line number for multi-line editing sessions. A value of /// zero suppresses @@ -312,6 +320,12 @@ /// tab key is typed. unsigned char TabCommand(int ch); + /// Apply autosuggestion part in gray as editline. + unsigned char ApplyAutosuggestCommand(int ch); + + /// Command used when a character is typed. + unsigned char TypedCharacter(int ch); + /// Respond to normal character insertion by fixing line indentation unsigned char FixIndentationCommand(int ch); @@ -359,9 +373,10 @@ FixIndentationCallbackType m_fix_indentation_callback = nullptr; void *m_fix_indentation_callback_baton = nullptr; const char *m_fix_indentation_callback_chars = nullptr; + SuggestionCallbackType m_suggestion_callback = nullptr; + void *m_suggestion_callback_baton = nullptr; CompleteCallbackType m_completion_callback = nullptr; void *m_completion_callback_baton = nullptr; - std::mutex m_output_mutex; }; } Index: lldb/include/lldb/Interpreter/CommandInterpreter.h =================================================================== --- lldb/include/lldb/Interpreter/CommandInterpreter.h +++ lldb/include/lldb/Interpreter/CommandInterpreter.h @@ -350,6 +350,10 @@ CommandObject *GetCommandObjectForCommand(llvm::StringRef &command_line); + /// Returns the auto-suggestion string that should be added to the given + /// command line. + llvm::Optional GetAutoSuggestionForCommand(llvm::StringRef line); + // This handles command line completion. void HandleCompletion(CompletionRequest &request); @@ -482,6 +486,8 @@ const char *GetCommandPrefix(); // Properties + void AddCommandHistory(std::vector histories); + bool GetExpandRegexAliases() const; bool GetPromptOnQuit() const; Index: lldb/source/Core/CoreProperties.td =================================================================== --- lldb/source/Core/CoreProperties.td +++ lldb/source/Core/CoreProperties.td @@ -131,4 +131,8 @@ Global, DefaultStringValue<"frame #${frame.index}: ${ansi.fg.yellow}${frame.pc}${ansi.normal}{ ${module.file.basename}{`${function.name-without-args}{${frame.no-debug}${function.pc-offset}}}}{ at ${ansi.fg.cyan}${line.file.basename}${ansi.normal}:${ansi.fg.yellow}${line.number}${ansi.normal}{:${ansi.fg.yellow}${line.column}${ansi.normal}}}{${function.is-optimized} [opt]}{${frame.is-artificial} [artificial]}\\\\n">, Desc<"The default frame format string to use when displaying stack frameinformation for threads from thread backtrace unique.">; + def ShowAutosuggestion: Property<"show-autosuggestion", "Boolean">, + Global, + DefaultFalse, + Desc<"If true, LLDB will show suggestions to complete the command the user typed.">; } Index: lldb/source/Core/Debugger.cpp =================================================================== --- lldb/source/Core/Debugger.cpp +++ lldb/source/Core/Debugger.cpp @@ -346,6 +346,12 @@ return ret; } +bool Debugger::GetUseAutosuggestion() const { + const uint32_t idx = ePropertyShowAutosuggestion; + return m_collection_sp->GetPropertyAtIndexAsBoolean( + nullptr, idx, g_debugger_properties[idx].default_uint_value != 0); +} + bool Debugger::GetUseSourceCache() const { const uint32_t idx = ePropertyUseSourceCache; return m_collection_sp->GetPropertyAtIndexAsBoolean( Index: lldb/source/Core/IOHandler.cpp =================================================================== --- lldb/source/Core/IOHandler.cpp +++ lldb/source/Core/IOHandler.cpp @@ -195,6 +195,14 @@ } } +llvm::Optional +IOHandlerDelegate::IOHandlerSuggestion(IOHandler &io_handler, + llvm::StringRef line) { + return io_handler.GetDebugger() + .GetCommandInterpreter() + .GetAutoSuggestionForCommand(line); +} + void IOHandlerDelegate::IOHandlerComplete(IOHandler &io_handler, CompletionRequest &request) { switch (m_completion) { @@ -258,6 +266,10 @@ m_color_prompts)); m_editline_up->SetIsInputCompleteCallback(IsInputCompleteCallback, this); m_editline_up->SetAutoCompleteCallback(AutoCompleteCallback, this); + if (debugger.GetUseAutosuggestion()) + m_editline_up->SetSuggestionCallback(SuggestionCallback, this); + std::vector histories = m_editline_up->AddHistories(); + this->GetDebugger().GetCommandInterpreter().AddCommandHistory(histories); // See if the delegate supports fixing indentation const char *indent_chars = delegate.IOHandlerGetFixIndentationCharacters(); if (indent_chars) { @@ -429,6 +441,16 @@ *editline_reader, lines, cursor_position); } +llvm::Optional +IOHandlerEditline::SuggestionCallback(llvm::StringRef line, void *baton) { + IOHandlerEditline *editline_reader = static_cast(baton); + if (editline_reader) + return editline_reader->m_delegate.IOHandlerSuggestion(*editline_reader, + line); + + return llvm::None; +} + void IOHandlerEditline::AutoCompleteCallback(CompletionRequest &request, void *baton) { IOHandlerEditline *editline_reader = (IOHandlerEditline *)baton; Index: lldb/source/Host/common/Editline.cpp =================================================================== --- lldb/source/Host/common/Editline.cpp +++ lldb/source/Host/common/Editline.cpp @@ -14,6 +14,7 @@ #include "lldb/Host/Editline.h" #include "lldb/Host/FileSystem.h" #include "lldb/Host/Host.h" +#include "lldb/Utility/AnsiTerminal.h" #include "lldb/Utility/CompletionRequest.h" #include "lldb/Utility/FileSpec.h" #include "lldb/Utility/LLDBAssert.h" @@ -289,6 +290,28 @@ return false; } + std::vector HistoryList() { + this->Load(); + std::vector histories; + if (m_history) { + const char *path = GetHistoryFilePath(); + if (path) { + history_w(m_history, &m_event, H_GETSIZE); + int num = m_event.num; + for (int i = 0; i < num; ++i) { + history_w(m_history, &m_event, H_SET, i); + history_w(m_history, &m_event, H_CURR); + std::string string_history = + std::wstring_convert>().to_bytes( + m_event.str); + histories.push_back( + string_history.substr(0, string_history.length() - 1)); + } + } + } + return histories; + } + protected: HistoryW *m_history; // The history object HistEventW m_event; // The history event needed to contain all history events @@ -1006,7 +1029,7 @@ to_add.push_back(request.GetParsedArg().GetQuoteChar()); to_add.push_back(' '); el_insertstr(m_editline, to_add.c_str()); - break; + return CC_REFRESH; } case CompletionMode::Partial: { std::string to_add = completion.GetCompletion(); @@ -1040,6 +1063,41 @@ return CC_REDISPLAY; } +unsigned char Editline::ApplyAutosuggestCommand(int ch) { + const LineInfo *line_info = el_line(m_editline); + llvm::StringRef line(line_info->buffer, + line_info->lastchar - line_info->buffer); + + if (llvm::Optional to_add = + m_suggestion_callback(line, m_suggestion_callback_baton)) { + el_insertstr(m_editline, to_add.getValue().c_str()); + return CC_REFRESH; + } + + return CC_REDISPLAY; +} + +unsigned char Editline::TypedCharacter(int ch) { + std::string typed = std::string(1, ch); + el_insertstr(m_editline, typed.c_str()); + const LineInfo *line_info = el_line(m_editline); + llvm::StringRef line(line_info->buffer, + line_info->lastchar - line_info->buffer); + + if (llvm::Optional to_add = + m_suggestion_callback(line, m_suggestion_callback_baton)) { + std::string to_add_color = ansi::FormatAnsiTerminalCodes("${ansi.faint}") + + to_add.getValue() + + ansi::FormatAnsiTerminalCodes("${ansi.normal}"); + fputs(typed.c_str(), m_output_file); + fputs(to_add_color.c_str(), m_output_file); + MoveCursor(CursorLocation::BlockEnd, CursorLocation::EditingPrompt); + return CC_REFRESH; + } + + return CC_REDISPLAY; +} + void Editline::ConfigureEditor(bool multiline) { if (m_editline && m_multiline_enabled == multiline) return; @@ -1153,9 +1211,41 @@ if (!multiline) { el_set(m_editline, EL_BIND, "^r", "em-inc-search-prev", NULL); // Cycle through backwards search, entering string + + if (m_suggestion_callback) { + el_wset(m_editline, EL_ADDFN, EditLineConstString("lldb-apply-complete"), + EditLineConstString("Adopt autocompletion"), + (EditlineCommandCallbackType)([](EditLine *editline, int ch) { + return Editline::InstanceFor(editline)->ApplyAutosuggestCommand( + ch); + })); + + el_set(m_editline, EL_BIND, "^f", "lldb-apply-complete", + NULL); // Apply a part that is suggested automatically + + el_wset(m_editline, EL_ADDFN, EditLineConstString("lldb-typed-character"), + EditLineConstString("Typed character"), + (EditlineCommandCallbackType)([](EditLine *editline, int ch) { + return Editline::InstanceFor(editline)->TypedCharacter(ch); + })); + + char bind_key[2] = {0, 0}; + llvm::StringRef ascii_chars = + "abcdefghijklmnopqrstuvwxzyABCDEFGHIJKLMNOPQRSTUVWXZY1234567890!\"#$%" + "&'()*+,./:;<=>?@[]_`{|}~ "; + for (char c : ascii_chars) { + bind_key[0] = c; + el_set(m_editline, EL_BIND, bind_key, "lldb-typed-character", NULL); + } + el_set(m_editline, EL_BIND, "\\-", "lldb-typed-character", NULL); + el_set(m_editline, EL_BIND, "\\^", "lldb-typed-character", NULL); + el_set(m_editline, EL_BIND, "\\\\", "lldb-typed-character", NULL); + } } + el_set(m_editline, EL_BIND, "^w", "ed-delete-prev-word", NULL); // Delete previous word, behave like bash in emacs mode + el_set(m_editline, EL_BIND, "\t", "lldb-complete", NULL); // Bind TAB to auto complete @@ -1364,6 +1454,12 @@ return result; } +void Editline::SetSuggestionCallback(SuggestionCallbackType callback, + void *baton) { + m_suggestion_callback = callback; + m_suggestion_callback_baton = baton; +} + void Editline::SetAutoCompleteCallback(CompleteCallbackType callback, void *baton) { m_completion_callback = callback; @@ -1511,3 +1607,7 @@ } #endif } + +std::vector Editline::AddHistories() { + return m_history_sp->HistoryList(); +} Index: lldb/source/Interpreter/CommandInterpreter.cpp =================================================================== --- lldb/source/Interpreter/CommandInterpreter.cpp +++ lldb/source/Interpreter/CommandInterpreter.cpp @@ -125,6 +125,12 @@ m_collection_sp->Initialize(g_interpreter_properties); } +void CommandInterpreter::AddCommandHistory(std::vector histories) { + for (std::string history : histories) { + this->m_command_history.AppendString(history); + } +} + bool CommandInterpreter::GetExpandRegexAliases() const { const uint32_t idx = ePropertyExpandRegexAliases; return m_collection_sp->GetPropertyAtIndexAsBoolean( @@ -1866,6 +1872,17 @@ HandleCompletionMatches(request); } +llvm::Optional +CommandInterpreter::GetAutoSuggestionForCommand(llvm::StringRef line) { + const size_t s = m_command_history.GetSize(); + for (int i = s - 1; i >= 0; --i) { + llvm::StringRef entry = m_command_history.GetStringAtIndex(i); + if (entry.consume_front(line)) + return entry.str(); + } + return llvm::None; +} + CommandInterpreter::~CommandInterpreter() {} void CommandInterpreter::UpdatePrompt(llvm::StringRef new_prompt) { Index: lldb/test/API/iohandler/autosuggestion/TestAutosuggestion.py =================================================================== --- /dev/null +++ lldb/test/API/iohandler/autosuggestion/TestAutosuggestion.py @@ -0,0 +1,83 @@ +""" +Tests autosuggestion using pexpect. +""" + +import lldb +from lldbsuite.test.decorators import * +from lldbsuite.test.lldbtest import * +from lldbsuite.test.lldbpexpect import PExpectTest + +class TestCase(PExpectTest): + + mydir = TestBase.compute_mydir(__file__) + + # PExpect uses many timeouts internally and doesn't play well + # under ASAN on a loaded machine.. + @skipIfAsan + @skipIfEditlineSupportMissing + def test_autosuggestion(self): + self.launch(extra_args=["-o", "settings set show-autosuggestion true"]) + + # Common input codes and escape sequences. + ctrl_f = "\x06" + faint_color = "\x1b[2m" + reset = "\x1b[0m" + delete = chr(127) + + frame_output_needle = "Syntax: frame " + # Run 'help frame' once to put it into the command history. + self.expect("help frame", substrs=[frame_output_needle]) + + # Check that LLDB shows the autosuggestion in gray behind the text. + self.child.send("hel") + self.child.expect_exact(faint_color + "p frame" + reset + "\x1b[1G") + + # Apply the autosuggestion and press enter. This should print the + # 'help frame' output if everything went correctly. + self.child.send(ctrl_f + "\n") + self.child.expect_exact(frame_output_needle) + + # Check that pressing Ctrl+F directly after Ctrl+F again does nothing. + self.child.send("hel" + ctrl_f + ctrl_f + "\n") + self.child.expect_exact(frame_output_needle) + + # Try autosuggestion using tab and ^f. + # \t makes "help" and ^f makes "help frame". If everything went + # correct we should see the 'help frame' output again. + self.child.send("hel\t" + ctrl_f + "\n") + self.child.expect_exact(frame_output_needle) + + # Check that pressing Ctrl+F in an empty prompt does nothing. + self.child.send(ctrl_f) + self.child.expect_exact("") + self.child.send("\n") + + # Check that autosuggestion works after delete. + self.child.send("a1234" + 5 * delete + "hel" + ctrl_f + "\n") + self.child.expect_exact(frame_output_needle) + + # Check that autosuggestion works after delete. + self.child.send("help x" + delete + ctrl_f + "\n") + self.child.expect_exact(frame_output_needle) + + # Check that autosuggestion complete to the most recent one. + self.child.send("help frame variable\n") + self.child.send("help fr") + self.child.expect_exact(faint_color + "ame variable" + reset) + self.child.send("\n") + + # Try another command. + apropos_output_needle = "Syntax: apropos " + # Run 'help frame' once to put it into the command history. + self.expect("help apropos", substrs=[apropos_output_needle]) + + # Check that 'hel' should have an autosuggestion for 'help apropos' now. + self.child.send("hel") + self.child.expect_exact(faint_color + "p apropos" + reset + "\x1b[1G") + + # Run the command and expect the 'help apropos' output. + self.child.send(ctrl_f + "\n") + self.child.expect_exact(apropos_output_needle) + + self.quit() + \ No newline at end of file