Make statusline separator configurable

Author: JDevlieghere

lldb/include/lldb/Core/Debugger.h

@@ -313,6 +313,8 @@ class Debugger : public std::enable_shared_from_this<Debugger>,
 
   std::vector<FormatEntity::Entry> GetStatuslineFormat() const;
 
+  llvm::StringRef GetStatuslineSeparator() const;
+
   llvm::StringRef GetShowProgressAnsiPrefix() const;
 
   llvm::StringRef GetShowProgressAnsiSuffix() const;

lldb/source/Core/CoreProperties.td

@@ -180,6 +180,10 @@ let Definition = "debugger" in {
     Global,
     DefaultStringValue<"${target.file.basename} ${line.file.basename}:${line.number}:${line.column} ${thread.stop-reason}">,
     Desc<"List of statusline format entities.">;
+  def StatuslineSeparator: Property<"statusline-separator", "String">,
+    Global,
+    DefaultStringValue<" | ">,
+    Desc<"Separator between statusline format entities.">;
   def UseSourceCache: Property<"use-source-cache", "Boolean">,
     Global,
     DefaultTrue,

lldb/source/Core/Debugger.cpp

@@ -469,6 +469,12 @@ std::vector<FormatEntity::Entry> Debugger::GetStatuslineFormat() const {
   return GetPropertyAtIndexAs<std::vector<FormatEntity::Entry>>(idx, {});
 }
 
+llvm::StringRef Debugger::GetStatuslineSeparator() const {
+  const uint32_t idx = ePropertyStatuslineSeparator;
+  return GetPropertyAtIndexAs<llvm::StringRef>(
+      idx, g_debugger_properties[idx].default_cstr_value);
+}
+
 bool Debugger::GetUseAutosuggestion() const {
   const uint32_t idx = ePropertyShowAutosuggestion;
   return GetPropertyAtIndexAs<bool>(

lldb/source/Core/Statusline.cpp

@@ -139,13 +139,19 @@ void Statusline::Update() {
   if (auto frame_sp = exe_ctx.GetFrameSP())
     symbol_ctx = frame_sp->GetSymbolContext(eSymbolContextEverything);
 
+  llvm::StringRef separator = m_debugger.GetStatuslineSeparator();
+
   // Add the user-configured components.
   bool add_separator = false;
   for (const FormatEntity::Entry &entry : m_debugger.GetStatuslineFormat()) {
+    StreamString format_entity_stream;
+    if (add_separator)
+      format_entity_stream << separator;
+    add_separator =
+        FormatEntity::Format(entry, format_entity_stream, &symbol_ctx, &exe_ctx,
+                             nullptr, nullptr, false, false);
     if (add_separator)
-      stream << " | ";
-    add_separator = FormatEntity::Format(entry, stream, &symbol_ctx, &exe_ctx,
-                                         nullptr, nullptr, false, false);
+      stream << format_entity_stream.GetString();
   }
 
   // Add progress reports at the end, if enabled.
@@ -157,7 +163,7 @@ void Statusline::Update() {
     }
     if (m_progress_report) {
       if (add_separator)
-        stream << " | ";
+        stream << separator;
       stream << m_progress_report->message;
     }
   }