Skip to content

Revert "[lldb] improve the heuristics for checking if a terminal supports Unicode (#168603) #170711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charles-zablit merged 1 commit into from
Dec 4, 2025
Merged

Revert "[lldb] improve the heuristics for checking if a terminal supports Unicode (#168603) #170711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions lldb/include/lldb/Host/Terminal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,6 @@ class Terminal {

llvm::Error SetHardwareFlowControl(bool enabled);

/// Returns whether or not the current terminal supports Unicode rendering.
///
/// The value is cached after the first computation.
///
/// On POSIX systems, we check if the LANG environment variable contains the
/// substring "UTF-8", case insensitive.
///
/// On Windows, we always return true since we use the `WriteConsoleW` API
/// internally. Note that the default Windows codepage (437) does not support
/// all Unicode characters. This function does not check the codepage.
static bool SupportsUnicode();

protected:
struct Data;

Expand Down
8 changes: 5 additions & 3 deletions lldb/source/Host/common/DiagnosticsRendering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
//===----------------------------------------------------------------------===//

#include "lldb/Host/common/DiagnosticsRendering.h"
#include "lldb/Host/Terminal.h"

#include <cstdint>

using namespace lldb_private;
Expand Down Expand Up @@ -99,8 +97,12 @@ void RenderDiagnosticDetails(Stream &stream,
return;
}

// Since there is no other way to find this out, use the color
// attribute as a proxy for whether the terminal supports Unicode
// characters. In the future it might make sense to move this into
// Host so it can be customized for a specific platform.
llvm::StringRef cursor, underline, vbar, joint, hbar, spacer;
if (Terminal::SupportsUnicode()) {
if (stream.AsRawOstream().colors_enabled()) {
cursor = "˄";
underline = "˜";
vbar = "│";
Expand Down
15 changes: 0 additions & 15 deletions lldb/source/Host/common/Terminal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,21 +400,6 @@ llvm::Error Terminal::SetHardwareFlowControl(bool enabled) {
#endif // LLDB_ENABLE_TERMIOS
}

bool Terminal::SupportsUnicode() {
static std::optional<bool> result;
if (result)
return result.value();
#ifdef _WIN32
return true;
#else
const char *lang_var = std::getenv("LANG");
if (!lang_var)
return false;
result = llvm::StringRef(lang_var).lower().find("utf-8") != std::string::npos;
#endif
return result.value();
}

TerminalState::TerminalState(Terminal term, bool save_process_group)
: m_tty(term) {
Save(term, save_process_group);
Expand Down
Loading