Fixed line wrapping for the "long help" content in LLDB commands. Content is now dynamically wrapped for the column width of the current terminal. Lines that begin with whitespace will be indented identically on subsequent lines to maintain formatting.

Existing commands supplying this type of help content have been reworked to take advantage of the changes.  In addition to formatting changes, content was changes for accuracy and clarity purposes.
    
<rdar://problem/21269977>

llvm-svn: 242122

1 files changed, 24 insertions, 2 deletions

diff --git a/lldb/source/Interpreter/CommandObject.cpp b/lldb/source/Interpreter/CommandObject.cpp
index d67f76e..c0efd9e 100644
--- a/lldb/source/Interpreter/CommandObject.cpp
+++ b/lldb/source/Interpreter/CommandObject.cpp
@@ -10,6 +10,7 @@
 #include "lldb/Interpreter/CommandObject.h"
 
 #include <string>
+#include <sstream>
 #include <map>
 
 #include <stdlib.h>
@@ -921,6 +922,27 @@ ExprPathHelpTextCallback()
 }
 
 void
+CommandObject::FormatLongHelpText (Stream &output_strm, const char *long_help)
+{
+    CommandInterpreter& interpreter = GetCommandInterpreter();
+    std::stringstream lineStream (long_help);
+    std::string line;
+    while (std::getline (lineStream, line)) {
+        if (line.empty()) {
+            output_strm << "\n";
+            continue;
+        }
+        size_t result = line.find_first_not_of (" \t");
+        if (result == std::string::npos) {
+            result = 0;
+        }
+        std::string whitespace_prefix = line.substr (0, result);
+        std::string remainder = line.substr (result);
+        interpreter.OutputFormattedHelpText(output_strm, whitespace_prefix.c_str(), remainder.c_str());
+    }
+}
+
+void
 CommandObject::GenerateHelpText (CommandReturnObject &result)
 {
     GenerateHelpText(result.GetOutputStream());
@@ -947,7 +969,7 @@ CommandObject::GenerateHelpText (Stream &output_strm)
         const char *long_help = GetHelpLong();
         if ((long_help != nullptr)
             && (strlen (long_help) > 0))
-            output_strm.Printf ("\n%s", long_help);
+            FormatLongHelpText (output_strm, long_help);
         if (WantsRawCommandString() && !WantsCompletion())
         {
             // Emit the message about using ' -- ' between the end of the command options and the raw input
@@ -984,7 +1006,7 @@ CommandObject::GenerateHelpText (Stream &output_strm)
         const char *long_help = GetHelpLong();
         if ((long_help != nullptr)
             && (strlen (long_help) > 0))
-            output_strm.Printf ("%s", long_help);
+            FormatLongHelpText (output_strm, long_help);
         else if (WantsRawCommandString())
         {
             std::string help_text (GetHelp());