Merge pull request #28612 from owenv/terminal_md_viewer

Author: swift-ci

include/swift/Markup/Markup.h

@@ -60,6 +60,7 @@ class MarkupContext final {
   LineList getLineList(swift::RawComment RC);
 };
 
+Document *parseDocument(MarkupContext &MC, StringRef String);
 Document *parseDocument(MarkupContext &MC, LineList &LL);
 
 } // namespace markup

lib/Frontend/PrintingDiagnosticConsumer.cpp

@@ -18,6 +18,7 @@
 #include "swift/AST/DiagnosticEngine.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/SourceManager.h"
+#include "swift/Markup/Markup.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Twine.h"
@@ -28,6 +29,7 @@
 #include <algorithm>
 
 using namespace swift;
+using namespace swift::markup;
 
 namespace {
   class ColoredStream : public raw_ostream {
@@ -85,6 +87,190 @@ namespace {
     size_t preferred_buffer_size() const override { return 0; }
   };
 
+// MARK: Markdown Printing
+    class TerminalMarkupPrinter : public MarkupASTVisitor<TerminalMarkupPrinter> {
+      llvm::raw_ostream &OS;
+      unsigned Indent;
+      unsigned ShouldBold;
+
+      void indent(unsigned Amount = 2) { Indent += Amount; }
+
+      void dedent(unsigned Amount = 2) {
+        assert(Indent >= Amount && "dedent without matching indent");
+        Indent -= Amount;
+      }
+
+      void bold() {
+        ++ShouldBold;
+        updateFormatting();
+      }
+
+      void unbold() {
+        assert(ShouldBold > 0 && "unbolded without matching bold");
+        --ShouldBold;
+        updateFormatting();
+      }
+
+      void updateFormatting() {
+        OS.resetColor();
+        if (ShouldBold > 0)
+          OS.changeColor(raw_ostream::Colors::SAVEDCOLOR, true);
+      }
+
+      void print(StringRef Str) {
+        for (auto c : Str) {
+          OS << c;
+          if (c == '\n')
+            for (unsigned i = 0; i < Indent; ++i)
+              OS << ' ';
+        }
+      }
+
+    public:
+      TerminalMarkupPrinter(llvm::raw_ostream &OS)
+          : OS(OS), Indent(0), ShouldBold(0) {}
+
+      void printNewline() { print("\n"); }
+
+      void visitDocument(const Document *D) {
+        for (const auto *Child : D->getChildren()) {
+          if (Child->getKind() == ASTNodeKind::Paragraph) {
+            // Add a newline before top-level paragraphs
+            printNewline();
+          }
+          visit(Child);
+        }
+      }
+
+      void visitBlockQuote(const BlockQuote *BQ) {
+        indent();
+        printNewline();
+        for (const auto *Child : BQ->getChildren())
+          visit(Child);
+        dedent();
+      }
+
+      void visitList(const List *BL) {
+        indent();
+        printNewline();
+        for (const auto *Child : BL->getChildren())
+          visit(Child);
+        dedent();
+      }
+
+      void visitItem(const Item *I) {
+        print("- ");
+        for (const auto *N : I->getChildren())
+          visit(N);
+      }
+
+      void visitCodeBlock(const CodeBlock *CB) {
+        indent();
+        printNewline();
+        print(CB->getLiteralContent());
+        dedent();
+      }
+
+      void visitCode(const Code *C) {
+        print("'");
+        print(C->getLiteralContent());
+        print("'");
+      }
+
+      void visitHTML(const HTML *H) { print(H->getLiteralContent()); }
+
+      void visitInlineHTML(const InlineHTML *IH) {
+        print(IH->getLiteralContent());
+      }
+
+      void visitSoftBreak(const SoftBreak *SB) { printNewline(); }
+
+      void visitLineBreak(const LineBreak *LB) {
+        printNewline();
+        printNewline();
+      }
+
+      void visitLink(const Link *L) {
+        print("[");
+        for (const auto *Child : L->getChildren())
+          visit(Child);
+        print("](");
+        print(L->getDestination());
+        print(")");
+      }
+
+      void visitImage(const Image *I) { llvm_unreachable("unsupported"); }
+
+      void visitParagraph(const Paragraph *P) {
+        for (const auto *Child : P->getChildren())
+          visit(Child);
+        printNewline();
+      }
+
+      // TODO: add raw_ostream support for italics ANSI codes in LLVM.
+      void visitEmphasis(const Emphasis *E) {
+        for (const auto *Child : E->getChildren())
+          visit(Child);
+      }
+
+      void visitStrong(const Strong *E) {
+        bold();
+        for (const auto *Child : E->getChildren())
+          visit(Child);
+        unbold();
+      }
+
+      void visitHRule(const HRule *HR) {
+        print("--------------");
+        printNewline();
+      }
+
+      void visitHeader(const Header *H) {
+        bold();
+        for (const auto *Child : H->getChildren())
+          visit(Child);
+        unbold();
+        printNewline();
+      }
+
+      void visitText(const Text *T) { print(T->getLiteralContent()); }
+
+      void visitPrivateExtension(const PrivateExtension *PE) {
+        llvm_unreachable("unsupported");
+      }
+
+      void visitParamField(const ParamField *PF) {
+        llvm_unreachable("unsupported");
+      }
+
+      void visitReturnField(const ReturnsField *RF) {
+        llvm_unreachable("unsupported");
+      }
+
+      void visitThrowField(const ThrowsField *TF) {
+        llvm_unreachable("unsupported");
+      }
+
+  #define MARKUP_SIMPLE_FIELD(Id, Keyword, XMLKind)                              \
+    void visit##Id(const Id *Field) { llvm_unreachable("unsupported"); }
+  #include "swift/Markup/SimpleFields.def"
+    };
+
+    static void printMarkdown(StringRef Content, raw_ostream &Out,
+                              bool UseColor) {
+      markup::MarkupContext ctx;
+      auto document = markup::parseDocument(ctx, Content);
+      if (UseColor) {
+        ColoredStream stream{Out};
+        TerminalMarkupPrinter printer(stream);
+        printer.visit(document);
+      } else {
+        NoColorStream stream{Out};
+        TerminalMarkupPrinter printer(stream);
+        printer.visit(document);
+      }
+    }
+
   // MARK: Experimental diagnostic printing.
 
   static void printDiagnosticKind(DiagnosticKind kind, raw_ostream &out) {
@@ -716,8 +902,10 @@ void PrintingDiagnosticConsumer::handleDiagnostic(SourceManager &SM,
     printDiagnostic(SM, Info);
 
     for (auto path : Info.EducationalNotePaths) {
-      if (auto buffer = SM.getFileSystem()->getBufferForFile(path))
-        Stream << buffer->get()->getBuffer() << "\n";
+      if (auto buffer = SM.getFileSystem()->getBufferForFile(path)) {
+        printMarkdown(buffer->get()->getBuffer(), Stream, ForceColors);
+        Stream << "\n";
+      }
     }
 
     for (auto ChildInfo : Info.ChildDiagnosticInfo) {