Redraw the statusline when editline has taken control of the screen

Author: JDevlieghere

lldb/include/lldb/Core/Debugger.h

@@ -417,6 +417,9 @@ class Debugger : public std::enable_shared_from_this<Debugger>,
   /// Decrement the "interrupt requested" counter.
   void CancelInterruptRequest();
 
+  /// Redraw the statusline if enabled.
+  void RedrawStatusline(bool update = true);
+
   /// This is the correct way to query the state of Interruption.
   /// If you are on the RunCommandInterpreter thread, it will check the
   /// command interpreter state, and if it is on another thread it will

lldb/include/lldb/Core/IOHandler.h

@@ -406,6 +406,8 @@ class IOHandlerEditline : public IOHandler {
   std::optional<std::string> SuggestionCallback(llvm::StringRef line);
 
   void AutoCompleteCallback(CompletionRequest &request);
+
+  void RedrawCallback();
 #endif
 
 protected:

lldb/include/lldb/Host/Editline.h

@@ -102,6 +102,8 @@ using SuggestionCallbackType =
 
 using CompleteCallbackType = llvm::unique_function<void(CompletionRequest &)>;
 
+using RedrawCallbackType = llvm::unique_function<void()>;
+
 /// Status used to decide when and how to start editing another line in
 /// multi-line sessions.
 enum class EditorStatus {
@@ -194,6 +196,11 @@ class Editline {
     m_suggestion_callback = std::move(callback);
   }
 
+  /// Register a callback for redrawing the statusline.
+  void SetRedrawCallback(RedrawCallbackType callback) {
+    m_redraw_callback = std::move(callback);
+  }
+
   /// Register a callback for the tab key
   void SetAutoCompleteCallback(CompleteCallbackType callback) {
     m_completion_callback = std::move(callback);
@@ -409,6 +416,7 @@ class Editline {
 
   CompleteCallbackType m_completion_callback;
   SuggestionCallbackType m_suggestion_callback;
+  RedrawCallbackType m_redraw_callback;
 
   bool m_color;
   std::string m_prompt_ansi_prefix;

lldb/source/Core/Debugger.cpp

@@ -258,8 +258,7 @@ Status Debugger::SetPropertyValue(const ExecutionContext *exe_ctx,
     } else if (property_path ==
                g_debugger_properties[ePropertyStatuslineFormat].name) {
       // Statusline format changed. Redraw the statusline.
-      if (m_statusline)
-        m_statusline->Redraw();
+      RedrawStatusline();
     } else if (property_path ==
                g_debugger_properties[ePropertyUseSourceCache].name) {
       // use-source-cache changed. Wipe out the cache contents if it was
@@ -1155,6 +1154,11 @@ void Debugger::RestoreInputTerminalState() {
     m_statusline->Enable();
 }
 
+void Debugger::RedrawStatusline(bool update) {
+  if (m_statusline)
+    m_statusline->Redraw(update);
+}
+
 ExecutionContext Debugger::GetSelectedExecutionContext() {
   bool adopt_selected = true;
   ExecutionContextRef exe_ctx_ref(GetSelectedTarget().get(), adopt_selected);
@@ -2084,8 +2088,7 @@ lldb::thread_result_t Debugger::DefaultEventHandler() {
         if (m_forward_listener_sp)
           m_forward_listener_sp->AddEvent(event_sp);
       }
-      if (m_statusline)
-        m_statusline->Redraw();
+      RedrawStatusline();
     }
   }
 
@@ -2176,9 +2179,7 @@ void Debugger::HandleProgressEvent(const lldb::EventSP &event_sp) {
     }
   }
 
-  // Redraw the statusline if enabled.
-  if (m_statusline)
-    m_statusline->Redraw();
+  RedrawStatusline();
 }
 
 std::optional<Debugger::ProgressReport>

lldb/source/Core/IOHandler.cpp

@@ -258,6 +258,7 @@ IOHandlerEditline::IOHandlerEditline(
     m_editline_up->SetAutoCompleteCallback([this](CompletionRequest &request) {
       this->AutoCompleteCallback(request);
     });
+    m_editline_up->SetRedrawCallback([this]() { this->RedrawCallback(); });
 
     if (debugger.GetUseAutosuggestion()) {
       m_editline_up->SetSuggestionCallback([this](llvm::StringRef line) {
@@ -439,6 +440,11 @@ IOHandlerEditline::SuggestionCallback(llvm::StringRef line) {
 void IOHandlerEditline::AutoCompleteCallback(CompletionRequest &request) {
   m_delegate.IOHandlerComplete(*this, request);
 }
+
+void IOHandlerEditline::RedrawCallback() {
+  m_debugger.RedrawStatusline(/*update=*/false);
+}
+
 #endif
 
 const char *IOHandlerEditline::GetPrompt() {

lldb/source/Host/common/Editline.cpp

@@ -567,6 +567,9 @@ int Editline::GetCharacter(EditLineGetCharType *c) {
     m_needs_prompt_repaint = false;
   }
 
+  if (m_redraw_callback)
+    m_redraw_callback();
+
   if (m_multiline_enabled) {
     // Detect when the number of rows used for this input line changes due to
     // an edit