https://github.com/JDevlieghere updated https://github.com/llvm/llvm-project/pull/174609
>From 148e3f38e9eed814b5b1d7cf960af511aecd9f16 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere <[email protected]> Date: Mon, 5 Jan 2026 11:45:32 -0600 Subject: [PATCH 1/2] [lldb] Don't trim expression in progress event Trimming the content of the progress event is the responsibility of the consumer, not the producer. When using the statusline, there's plenty of space to show longer expressions. rdar://166879951 --- lldb/source/Expression/UserExpression.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lldb/source/Expression/UserExpression.cpp b/lldb/source/Expression/UserExpression.cpp index 5563eba21777e..ff7a356dbbb1e 100644 --- a/lldb/source/Expression/UserExpression.cpp +++ b/lldb/source/Expression/UserExpression.cpp @@ -427,15 +427,10 @@ UserExpression::Execute(DiagnosticManager &diagnostic_manager, lldb::ExpressionVariableSP &result_var) { Debugger *debugger = exe_ctx.GetTargetPtr() ? &exe_ctx.GetTargetPtr()->GetDebugger() : nullptr; - std::string details; - if (m_options.IsForUtilityExpr()) - details = "LLDB utility"; - else if (m_expr_text.size() > 15) - details = m_expr_text.substr(0, 14) + "…"; - else - details = m_expr_text; - Progress progress("Running expression", details, {}, debugger); + Progress progress("Running expression", + m_options.IsForUtilityExpr() ? "LLDB utility" : m_expr_text, + {}, debugger); lldb::ExpressionResults expr_result = DoExecute( diagnostic_manager, exe_ctx, options, shared_ptr_to_me, result_var); >From f2745bfd63d1e9fa4a49e60bb08abdfcf8706df2 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere <[email protected]> Date: Tue, 6 Jan 2026 09:55:09 -0800 Subject: [PATCH 2/2] Update test --- lldb/test/Shell/Expr/TestExecProgress.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lldb/test/Shell/Expr/TestExecProgress.test b/lldb/test/Shell/Expr/TestExecProgress.test index 3f0ae9ffe5633..5706b6189f528 100644 --- a/lldb/test/Shell/Expr/TestExecProgress.test +++ b/lldb/test/Shell/Expr/TestExecProgress.test @@ -5,4 +5,4 @@ expr 1 // And a very long comment. quit # CHECK: {{title = "Running expression", details = "1"}} -# CHECK: {{title = "Running expression", details = "1 // And a ver…"}} +# CHECK: {{title = "Running expression", details = "1 // And a very long comment."}} _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
