From 23bbe81b9233d28136272e9f9c702f7728762b9c Mon Sep 17 00:00:00 2001
From: Fangrui Song <i@maskray.me>
Date: Mon, 25 Dec 2017 11:20:47 -0800
Subject: [PATCH] Un-indent extracted comments (#191)

---
 src/clang_cursor.cc | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/clang_cursor.cc b/src/clang_cursor.cc
index c18a8eb3..908a2902 100644
--- a/src/clang_cursor.cc
+++ b/src/clang_cursor.cc
@@ -188,17 +188,30 @@ std::string ClangCursor::get_type_description() const {
 optional<std::string> ClangCursor::get_comments() const {
   if (!g_enable_comments)
     return nullopt;
-  ClangCursor referenced = get_referenced();
-  // TODO Format comments
-  std::string ret =
-      referenced
-          // Get unformatted comments. Returns multiple paragraphs.
-          ? ::ToString(clang_Cursor_getRawCommentText(referenced.cx_cursor))
-          // Get formatted comments. Returns only the first paragraph.
-          : ::ToString(clang_Cursor_getBriefCommentText(referenced.cx_cursor));
-  if (ret.empty())
+  CXSourceRange range = clang_Cursor_getCommentRange(cx_cursor);
+  if (clang_Range_isNull(range))
     return nullopt;
-  return ret;
+
+  unsigned start_column;
+  clang_getSpellingLocation(clang_getRangeStart(range), nullptr, nullptr,
+                            &start_column, nullptr);
+
+  // Get associated comment text.
+  CXString cx_raw = clang_Cursor_getRawCommentText(cx_cursor);
+  // The first line starts with a comment marker, but the rest needs un-indenting.
+  std::string unindented;
+  for (const char* p = clang_getCString(cx_raw); *p; ) {
+    auto skip = start_column - 1;
+    for (; skip > 0 && (*p == ' ' || *p == '\t'); p++)
+      skip--;
+    const char* q = p;
+    while (*q != '\n' && *q) q++;
+    if (*q) q++;
+    unindented.insert(unindented.end(), p, q);
+    p = q;
+  }
+  clang_disposeString(cx_raw);
+  return unindented;
 }
 
 std::string ClangCursor::ToString() const {