From 8427c283cba206f781d81050b06ab7e0c6626f2b Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 17 Sep 2020 17:08:43 +0200 Subject: [PATCH] ClangBackEnd: Convert Windows line endings in Cursor::rawComment() The comment really is "raw" in that clang does not convert \r\n, so we have to do that ourselves. This fixes another unit test case on Windows. Change-Id: If70678485ed31c241a04fc44b3502e1ff3252508 Reviewed-by: Christian Stenger --- src/tools/clangbackend/source/cursor.cpp | 6 ++++-- src/tools/clangbackend/source/cursor.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/tools/clangbackend/source/cursor.cpp b/src/tools/clangbackend/source/cursor.cpp index 00fde42cc82..e8092186be6 100644 --- a/src/tools/clangbackend/source/cursor.cpp +++ b/src/tools/clangbackend/source/cursor.cpp @@ -246,9 +246,11 @@ ClangString Cursor::briefComment() const return ClangString(clang_Cursor_getBriefCommentText(m_cxCursor)); } -ClangString Cursor::rawComment() const +Utf8String Cursor::rawComment() const { - return ClangString(clang_Cursor_getRawCommentText(m_cxCursor)); + Utf8String comment = ClangString(clang_Cursor_getRawCommentText(m_cxCursor)); + comment.replace(Utf8String("\r\n"), Utf8String("\n")); + return comment; } int Cursor::argumentCount() const diff --git a/src/tools/clangbackend/source/cursor.h b/src/tools/clangbackend/source/cursor.h index 6541e633e65..c748db47252 100644 --- a/src/tools/clangbackend/source/cursor.h +++ b/src/tools/clangbackend/source/cursor.h @@ -79,7 +79,7 @@ public: ClangString mangling() const; ClangString spelling() const; ClangString briefComment() const; - ClangString rawComment() const; + Utf8String rawComment() const; int argumentCount() const; Type type() const;