[Lldb-commits] [lldb] f90fa55 - [lldb][gui] use just '#2' instead of 'frame #2' in the threads/frame view

[Luboš Luňák via lldb-commits]

Author: Luboš Luňák
Date: 2022-04-05T08:29:13+02:00
New Revision: f90fa55569fc8fc3b44512823ed9e2a0d1243826

URL: https://github.com/llvm/llvm-project/commit/f90fa55569fc8fc3b44512823ed9e2a0d1243826
DIFF: https://github.com/llvm/llvm-project/commit/f90fa55569fc8fc3b44512823ed9e2a0d1243826.diff

LOG: [lldb][gui] use just '#2' instead of 'frame #2' in the threads/frame view

Since the threads/frame view is taking only a small part on the right side
of the screen, only a part of the function name of each frame is visible.
It seems rather wasteful to spell out 'frame' there when it's obvious
that it is a frame, it's better to use the space for more of the function
name.

Differential Revision: https://reviews.llvm.org/D122998

Added: 
    

Modified: 
    lldb/source/Core/IOHandlerCursesGUI.cpp
    lldb/test/API/commands/gui/expand-threads-tree/TestGuiExpandThreadsTree.py

Removed: 
    


################################################################################
diff  --git a/lldb/source/Core/IOHandlerCursesGUI.cpp b/lldb/source/Core/IOHandlerCursesGUI.cpp
index 8577f4b282974..7fc23292983fa 100644
--- a/lldb/source/Core/IOHandlerCursesGUI.cpp
+++ b/lldb/source/Core/IOHandlerCursesGUI.cpp
@@ -5016,8 +5016,7 @@ class FrameTreeDelegate : public TreeDelegate {
 public:
   FrameTreeDelegate() : TreeDelegate() {
     FormatEntity::Parse(
-        "frame #${frame.index}: {${function.name}${function.pc-offset}}}",
-        m_format);
+        "#${frame.index}: {${function.name}${function.pc-offset}}}", m_format);
   }
 
   ~FrameTreeDelegate() override = default;

diff  --git a/lldb/test/API/commands/gui/expand-threads-tree/TestGuiExpandThreadsTree.py b/lldb/test/API/commands/gui/expand-threads-tree/TestGuiExpandThreadsTree.py
index 9eed5b0ef6c39..34a6bf3643534 100644
--- a/lldb/test/API/commands/gui/expand-threads-tree/TestGuiExpandThreadsTree.py
+++ b/lldb/test/API/commands/gui/expand-threads-tree/TestGuiExpandThreadsTree.py
@@ -33,7 +33,7 @@ def test_gui(self):
         self.child.expect_exact("Threads")
 
         # The thread running thread_start_routine should be expanded.
-        self.child.expect_exact("frame #0: break_here")
+        self.child.expect_exact("#0: break_here")
 
         # Exit GUI.
         self.child.send(escape_key)
@@ -47,7 +47,7 @@ def test_gui(self):
         self.child.expect_exact("Threads")
 
         # The main thread should be expanded.
-        self.child.expect("frame #\d+: main")
+        self.child.expect("#\d+: main")
 
         # Quit the GUI
         self.child.send(escape_key)