Merge pull request llvm#10483 from swiftlang/revert-10474-rdar148769820

Revert "[lldb] Customize the statusline for the Swift REPL"

Author: adrian-prantl

lldb/include/lldb/Core/Debugger.h

@@ -311,7 +311,6 @@ class Debugger : public std::enable_shared_from_this<Debugger>,
   bool GetShowStatusline() const;
 
   const FormatEntity::Entry *GetStatuslineFormat() const;
-  bool SetStatuslineFormat(const FormatEntity::Entry &format);
 
   llvm::StringRef GetShowProgressAnsiPrefix() const;
 

lldb/include/lldb/Interpreter/OptionValue.h

@@ -72,7 +72,7 @@ class OptionValue {
   virtual ~OptionValue() = default;
 
   OptionValue(const OptionValue &other);
-
+  
   OptionValue& operator=(const OptionValue &other);
 
   // Subclasses should override these functions
@@ -330,10 +330,6 @@ class OptionValue {
 
   bool SetValueAs(ArchSpec v) { return SetArchSpecValue(v); }
 
-  bool SetValueAs(const FormatEntity::Entry &v) {
-    return SetFormatEntityValue(v);
-  }
-
   template <typename T, std::enable_if_t<std::is_enum_v<T>, bool> = true>
   bool SetValueAs(T t) {
     return SetEnumerationValue(t);
@@ -391,10 +387,8 @@ class OptionValue {
   bool SetUUIDValue(const UUID &uuid);
 
   const FormatEntity::Entry *GetFormatEntity() const;
-  bool SetFormatEntityValue(const FormatEntity::Entry &entry);
-
   const RegularExpression *GetRegexValue() const;
-
+  
   mutable std::mutex m_mutex;
 };
 

lldb/source/Core/Debugger.cpp

@@ -481,13 +481,6 @@ const FormatEntity::Entry *Debugger::GetStatuslineFormat() const {
   return GetPropertyAtIndexAs<const FormatEntity::Entry *>(idx);
 }
 
-bool Debugger::SetStatuslineFormat(const FormatEntity::Entry &format) {
-  constexpr uint32_t idx = ePropertyStatuslineFormat;
-  bool ret = SetPropertyAtIndex(idx, format);
-  RedrawStatusline();
-  return ret;
-}
-
 bool Debugger::GetUseAutosuggestion() const {
   const uint32_t idx = ePropertyShowAutosuggestion;
   return GetPropertyAtIndexAs<bool>(

lldb/source/Interpreter/OptionValue.cpp

@@ -474,15 +474,6 @@ bool OptionValue::SetArchSpecValue(ArchSpec arch_spec) {
   return false;
 }
 
-bool OptionValue::SetFormatEntityValue(const FormatEntity::Entry &entry) {
-  std::lock_guard<std::mutex> lock(m_mutex);
-  if (OptionValueFormatEntity *option_value = GetAsFormatEntity()) {
-    option_value->SetCurrentValue(entry);
-    return true;
-  }
-  return false;
-}
-
 const char *OptionValue::GetBuiltinTypeAsCString(Type t) {
   switch (t) {
   case eTypeInvalid:

lldb/source/Plugins/ExpressionParser/Swift/SwiftREPL.cpp

@@ -303,16 +303,7 @@ Status SwiftREPL::DoInitialization() {
   std::static_pointer_cast<TypeSystemSwiftTypeRefForExpressions>(
       *type_system_or_err)
       ->SetCompilerOptions(m_compiler_options.c_str());
-
-  std::string format_str = "${ansi.negative}Swift " +
-                           swift::version::getCompilerVersion() +
-                           "{ | {${progress.count} }${progress.message}}";
-  FormatEntity::Entry format_entry;
-  Status error = FormatEntity::Parse(format_str, format_entry);
-  if (error.Success())
-    m_target.GetDebugger().SetStatuslineFormat(format_entry);
-
-  return error;
+  return Status();
 }
 
 llvm::StringRef SwiftREPL::GetSourceFileBasename() {

lldb/unittests/Core/CMakeLists.txt

@@ -1,5 +1,4 @@
 add_lldb_unittest(LLDBCoreTests
-  DebuggerTest.cpp
   CommunicationTest.cpp
   DiagnosticEventTest.cpp
   DumpDataExtractorTest.cpp