[Lldb-commits] [lldb] r299147 - Don't add a newline if the object description already has one.

[Jim Ingham via lldb-commits]

Author: jingham
Date: Thu Mar 30 20:32:57 2017
New Revision: 299147

URL: http://llvm.org/viewvc/llvm-project?rev=299147&view=rev
Log:
Don't add a newline if the object description already has one.

<rdar://problem/25755431>

Modified:
    lldb/trunk/source/DataFormatters/ValueObjectPrinter.cpp

Modified: lldb/trunk/source/DataFormatters/ValueObjectPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/ValueObjectPrinter.cpp?rev=299147&r1=299146&r2=299147&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/ValueObjectPrinter.cpp (original)
+++ lldb/trunk/source/DataFormatters/ValueObjectPrinter.cpp Thu Mar 30 20:32:57 2017
@@ -457,7 +457,12 @@ bool ValueObjectPrinter::PrintObjectDesc
       else
         object_desc = GetDescriptionForDisplay();
       if (object_desc && *object_desc) {
-        m_stream->Printf("%s\n", object_desc);
+        // If the description already ends with a \n don't add another one.
+        size_t object_end = strlen(object_desc) - 1;
+        if (object_desc[object_end] == '\n')
+            m_stream->Printf("%s", object_desc);
+        else
+            m_stream->Printf("%s\n", object_desc);        
         return true;
       } else if (value_printed == false && summary_printed == false)
         return true;