Match diagnostic output formatting from the PrintDiagnosticConsumer

Author: artemcm

include/swift/Frontend/AccumulatingDiagnosticConsumer.h

@@ -30,21 +30,67 @@ namespace swift {
 /// collection.
 class AccumulatingFileDiagnosticConsumer : public DiagnosticConsumer {
   std::vector<std::string> &Diagnostics;
+
 public:
   AccumulatingFileDiagnosticConsumer(std::vector<std::string> &DiagBuffer)
     : Diagnostics(DiagBuffer) {}
 
 private:
   void handleDiagnostic(SourceManager &SM,
                         const DiagnosticInfo &Info) override {
-    std::string DiagMsg;
-    llvm::raw_string_ostream DiagOS(DiagMsg);
-    DiagnosticEngine::formatDiagnosticText(DiagOS, Info.FormatString,
-                                           Info.FormatArgs);
-    auto LC = SM.getPresumedLineAndColumnForLoc(Info.Loc);
-    std::ostringstream StrOS;
-    StrOS << LC.first << ", " << LC.second << ": " << DiagOS.str();
-    Diagnostics.push_back(StrOS.str());
+    addDiagnostic(SM, Info);
+
+    for (auto ChildInfo : Info.ChildDiagnosticInfo) {
+      addDiagnostic(SM, *ChildInfo);
+    }
+  }
+
+  // TODO: Support Swift-style diagnostic formatting
+  void addDiagnostic(SourceManager &SM, const DiagnosticInfo &Info) {
+    // Determine what kind of diagnostic we're emitting.
+    llvm::SourceMgr::DiagKind SMKind;
+    switch (Info.Kind) {
+    case DiagnosticKind::Error:
+      SMKind = llvm::SourceMgr::DK_Error;
+      break;
+    case DiagnosticKind::Warning:
+      SMKind = llvm::SourceMgr::DK_Warning;
+      break;
+
+    case DiagnosticKind::Note:
+      SMKind = llvm::SourceMgr::DK_Note;
+      break;
+
+    case DiagnosticKind::Remark:
+      SMKind = llvm::SourceMgr::DK_Remark;
+      break;
+    }
+
+    // Translate ranges.
+    SmallVector<llvm::SMRange, 2> Ranges;
+    for (auto R : Info.Ranges)
+      Ranges.push_back(getRawRange(SM, R));
+
+    // Translate fix-its.
+    SmallVector<llvm::SMFixIt, 2> FixIts;
+    for (DiagnosticInfo::FixIt F : Info.FixIts)
+      FixIts.push_back(getRawFixIt(SM, F));
+
+    // Actually substitute the diagnostic arguments into the diagnostic text.
+    llvm::SmallString<256> Text;
+    {
+      llvm::raw_svector_ostream Out(Text);
+      DiagnosticEngine::formatDiagnosticText(Out, Info.FormatString,
+                                             Info.FormatArgs);
+    }
+
+    const llvm::SourceMgr &rawSM = SM.getLLVMSourceMgr();
+    auto Msg = SM.GetMessage(Info.Loc, SMKind, Text, Ranges, FixIts);
+    std::string result;
+    llvm::raw_string_ostream os(result);
+    rawSM.PrintMessage(os, Msg, false);
+    os.flush();
+    Diagnostics.push_back(result);
   }
 };
 }

lib/Basic/ParseableOutput.cpp

@@ -464,7 +464,7 @@ void parseable_output::emitFinishedMessage(
 
         // Join all diagnostics produced for this file into a single output.
         auto PrimaryDiags = FileSpecificDiagnostics.lookup(Input.getFileName());
-        const char *const Delim = "\n";
+        const char *const Delim = "";
         std::ostringstream JoinedDiags;
         std::copy(PrimaryDiags.begin(), PrimaryDiags.end(),
                   std::ostream_iterator<std::string>(JoinedDiags, Delim));

test/Frontend/parseable_output_error.swift

@@ -54,7 +54,7 @@ func foo() {
 // CHECK-NEXT: {
 // CHECK-NEXT:   "kind": "finished",
 // CHECK-NEXT:   "name": "compile",
-// CHECK-NEXT:   "output": "5, 12: unexpected non-void return value in void function\n5, 12: did you mean to add a return type?\n",
+// CHECK-NEXT:   "output": "{{.*[\\/]}}parseable_output_error.swift:5:12: error: unexpected non-void return value in void function{{.*}}return 11;{{.*[\\/]}}parseable_output_error.swift:5:12: note: did you mean to add a return type?{{.*}}return 11;
 // CHECK-NEXT:   "process": {
 // CHECK-NEXT:     "real_pid": [[PID]]
 // CHECK-NEXT:   },