Adapt Swift plugin for upstream API changes

Author: adrian-prantl

lldb/source/Expression/REPL.cpp

@@ -407,12 +407,25 @@ void REPL::IOHandlerInputComplete(IOHandler &io_handler, std::string &code) {
             [[fallthrough]];
           case lldb::eExpressionDiscarded:
             // FIXME: BEGIN SWIFT
-            if (error.Success() && result_valobj_sp)
-              error_sp->Printf("%s\n",
-                               result_valobj_sp->GetError().AsCString());
-            else
-            // END SWIFT
-            error_sp->Printf("%s\n", error.AsCString());
+            if (error.Success() && result_valobj_sp) {
+              // The color detection in RenderDiagnosticDetails doesn't work
+              // with error_sp.
+              StreamString diag_stream(useColors);
+              std::vector<DiagnosticDetail> diags;
+              llvm::Error error = result_valobj_sp->GetError().ToError();
+              error = llvm::handleErrors(
+                  std::move(error),
+                  [&](DiagnosticError &error) { diags = error.GetDetails(); });
+              // FIXME: Only correct for the first 999 lines.
+              unsigned prompt_len =
+                  llvm::StringRef(io_handler.GetPrompt()).size() + 3;
+              RenderDiagnosticDetails(diag_stream, prompt_len, true, diags);
+              *error_sp << diag_stream.GetString();
+              if (error)
+                *error_sp << toString(std::move(error));
+            } else
+              // END SWIFT
+              error_sp->Printf("%s\n", error.AsCString());
             break;
 
           case lldb::eExpressionCompleted:

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp

@@ -42,6 +42,7 @@
 #include "lldb/Symbol/VariableList.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Target/UnwindLLDB.h"
+#include "lldb/Utility/ErrorMessages.h"
 #include "lldb/Utility/LLDBLog.h"
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/OptionParsing.h"
@@ -1068,30 +1069,21 @@ llvm::Error SwiftLanguageRuntimeImpl::RunObjectDescriptionExpr(
       frame_sp.get(),
       result_sp, eval_options);
 
-  if (log) {
-    const char *eval_result_str = ExpressionResultAsCString(eval_result);
-    log->Printf("[RunObjectDescriptionExpr] %s", eval_result_str);
-  }
+  LLDB_LOG(log, "[RunObjectDescriptionExpr] {0}", toString(eval_result));
 
   // Sanity check the result of the expression before moving forward
   if (!result_sp) {
-    if (log)
-      log->Printf(
-          "[RunObjectDescriptionExpr] expression generated no result");
-
+    LLDB_LOG(log, "[RunObjectDescriptionExpr] expression generated no result");
     return llvm::createStringError("expression produced no result");
   }
   if (result_sp->GetError().Fail()) {
-    if (log)
-      log->Printf(
-          "[RunObjectDescriptionExpr] expression generated error: %s",
-          result_sp->GetError().AsCString());
+    LLDB_LOG(log, "[RunObjectDescriptionExpr] expression generated error: {0}",
+             result_sp->GetError().AsCString());
 
     return result_sp->GetError().ToError();
   }
   if (!result_sp->GetCompilerType().IsValid()) {
-    if (log)
-      log->Printf("[RunObjectDescriptionExpr] expression generated "
+    LLDB_LOG(log, "[RunObjectDescriptionExpr] expression generated "
                   "invalid type");
 
     return llvm::createStringError("expression produced invalid result type");
@@ -1107,14 +1099,13 @@ llvm::Error SwiftLanguageRuntimeImpl::RunObjectDescriptionExpr(
               .SetLanguage(lldb::eLanguageTypeSwift)
               .SetCapping(eTypeSummaryUncapped),
           dump_options)) {
-    if (log)
-      log->Printf("[RunObjectDescriptionExpr] expression completed "
-                  "successfully");
+    LLDB_LOG(log,
+             "[RunObjectDescriptionExpr] expression completed successfully");
     return llvm::Error::success();
   }
-  if (log)
-    log->Printf("[RunObjectDescriptionExpr] expression generated "
-                "invalid string data");
+  LLDB_LOG(
+      log,
+      "[RunObjectDescriptionExpr] expression generated invalid string data");
 
   return llvm::createStringError("expression produced unprintable string");
 }

lldb/source/Plugins/TypeSystem/Swift/StoringDiagnosticConsumer.h

@@ -149,15 +149,20 @@ class StoringDiagnosticConsumer : public swift::DiagnosticConsumer {
       }
       return;
     }
-    // FIXME: extract this from ranges!
-    uint16_t len = 0;
+    // FXIME: This is a heuristic.
+    uint16_t len = info.Ranges.size() ? info.Ranges.front().getByteLength() : 0;
     bool in_user_input = false;
     // FIXME: improve this!
-    if (buffer_name == "<REPL>" || buffer_name.starts_with("<user expression"))
+    if (buffer_name == "<REPL>" || buffer_name == "<EXPR>" ||
+        buffer_name == "repl.swift" ||
+        buffer_name.starts_with("<user expression"))
       in_user_input = true;
-    DiagnosticDetail::SourceLocation loc = {
-        FileSpec{buffer_name.str()}, line_col.first, (uint16_t)line_col.second,
-        len, in_user_input};
+    DiagnosticDetail::SourceLocation loc = {FileSpec{buffer_name.str()},
+                                            line_col.first,
+                                            (uint16_t)line_col.second,
+                                            len,
+                                            !in_user_input,
+                                            in_user_input};
     DiagnosticDetail detail = {loc, severity, raw_text, formatted_text};
     RawDiagnostic diagnostic(
         detail, buffer_id,

lldb/test/API/lang/swift/foundation_value_types/notification/TestSwiftFoundationTypeNotification.py

@@ -14,7 +14,6 @@ def test(self):
         self.build()
         target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
             self, 'break here', lldb.SBFileSpec('main.swift'))
-        self.expect("log enable lldb types -v")
         # global
         self.expect("target variable -d run g_notification",
                     substrs=['name = ', '"MyNotification"',

lldb/test/Shell/Swift/expression-diagnostics.test

@@ -0,0 +1,12 @@
+# REQUIRES: swift
+# RUN: rm -rf %t && mkdir %t && cd %t
+# RUN: %target-swiftc -g %S/Inputs/Global.swift
+# RUN: %lldb Global -s %s | FileCheck --strict-whitespace %s
+
+b main
+run
+expr foo+bar
+#       (lldb) expr foo+bar
+# CHECK:            ^~~ ^~~
+# CHECK:            |   error: cannot find 'bar' in scope
+# CHECK:            error: cannot find 'foo' in scope

lldb/test/Shell/SwiftREPL/LookupWithAttributedImport.test

@@ -15,7 +15,7 @@ let y = Bar(baz: 123)
 // CHECK: baz = 123
 
 let x = Foo(bar:42)
-// CHECK: repl.swift:{{.*}}: cannot find 'Foo' in scope
+// CHECK: error: cannot find 'Foo' in scope
 
 @testable import Test
 

lldb/test/Shell/SwiftREPL/PropertyWrapperTopLevel.test

@@ -35,4 +35,3 @@
 @A var anA: Int = 1
 
 // CHECK: property wrappers are not yet supported in top-level code
-// CHECK-NEXT: @A var anA: Int = 1