================
@@ -240,6 +241,121 @@ inline std::string StripAnsiTerminalCodes(llvm::StringRef
str) {
return stripped;
}
+inline size_t ColumnWidth(llvm::StringRef str) {
+ std::string stripped = ansi::StripAnsiTerminalCodes(str);
+ return llvm::sys::locale::columnWidth(stripped);
+}
+
+/// Trim the given string to the given visible length, at a word boundary.
+/// Visible length means its width when rendered to the terminal.
+/// The string can include ANSI codes and Unicode.
+///
+/// For a single word string, that word is returned in its entirety regardless
+/// of it's visible length.
+///
+/// This function is similar to TrimAndPad, except that it must split on a word
+/// boundary. So there are some noteable differences:
+/// * Has a special case for single words that exceed desired visible
+/// length.
+/// * Must track whether the most recent modifications was on a word boundary
+/// or not.
+/// * If the trimming finishes without the result ending on a word boundary,
+/// it must find the nearest boundary to that trim point by trimming more.
+inline std::string TrimAtWordBoundary(llvm::StringRef str,
+ size_t visible_length) {
+ str = str.trim();
+ if (str.empty())
+ return str.str();
+
+ auto first_whitespace = str.find_first_of(" \t\n");
+ // No whitespace means a single word, which we cannot split.
+ if (first_whitespace == llvm::StringRef::npos)
+ return str.str();
+
+ // If the first word of a multi-word string is too wide, return that whole
+ // word only.
+ auto to_first_word_boundary = str.substr(0, first_whitespace);
+ // We use ansi::ColumnWidth here because it can handle ANSI and Unicode.
+ if (static_cast<size_t>(ansi::ColumnWidth(to_first_word_boundary)) >
----------------
DavidSpickett wrote:
Fixed.
https://github.com/llvm/llvm-project/pull/183314
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
