* Use GetSetting instead of Handle command

* Implement OptionValueEnumeration::ToJSON

Author: eronnen

lldb/include/lldb/Interpreter/OptionValueEnumeration.h

@@ -41,6 +41,8 @@ class OptionValueEnumeration
   void DumpValue(const ExecutionContext *exe_ctx, Stream &strm,
                  uint32_t dump_mask) override;
 
+  llvm::json::Value ToJSON(const ExecutionContext *exe_ctx) override;
+
   Status
   SetValueFromString(llvm::StringRef value,
                      VarSetOperationType op = eVarSetOperationAssign) override;

lldb/source/Interpreter/OptionValueEnumeration.cpp

@@ -37,6 +37,18 @@ void OptionValueEnumeration::DumpValue(const ExecutionContext *exe_ctx,
   }
 }
 
+llvm::json::Value
+OptionValueEnumeration::ToJSON(const ExecutionContext *exe_ctx) {
+  const size_t count = m_enumerations.GetSize();
+  for (size_t i = 0; i < count; ++i) {
+    if (m_enumerations.GetValueAtIndexUnchecked(i).value == m_current_value) {
+      return m_enumerations.GetCStringAtIndex(i).GetStringRef();
+    }
+  }
+
+  return m_current_value;
+}
+
 Status OptionValueEnumeration::SetValueFromString(llvm::StringRef value,
                                                   VarSetOperationType op) {
   Status error;

lldb/tools/lldb-dap/LLDBUtils.cpp

@@ -164,22 +164,16 @@ GetEnvironmentFromArguments(const llvm::json::Object &arguments) {
 }
 
 std::string GetStopDisassemblyDisplay(lldb::SBDebugger &debugger) {
-  std::string stop_disassembly_display = "no-debuginfo"; // default value
-  lldb::SBCommandReturnObject result;
-  debugger.GetCommandInterpreter().HandleCommand(
-      "settings show stop-disassembly-display", result);
-  if (result.Succeeded()) {
-    std::string output = result.GetOutput();
-    size_t pos = output.find("stop-disassembly-display");
-    if (pos != std::string::npos) {
-      size_t start = output.find("= ", pos) + 2;
-      size_t end = output.find("\n", start);
-      stop_disassembly_display =
-          output.substr(start, end - start); // trim whitespace
-    }
+  lldb::SBStructuredData result =
+      debugger.GetSetting("stop-disassembly-display");
+  const size_t result_length = result.GetStringValue(nullptr, 0);
+  if (result_length > 0) {
+    std::string result_string(result_length, '\0');
+    result.GetStringValue(result_string.data(), result_length + 1);
+    return result_string;
   }
 
-  return stop_disassembly_display;
+  return "no-debuginfo";
 }
 
 llvm::Error ToError(const lldb::SBError &error) {