Fix an issue where the apropos command would not print fully qualified command names for nested command objects

rdar://problem/26020072

llvm-svn: 268309

2 files changed, 23 insertions, 1 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/help/TestApropos.py b/lldb/packages/Python/lldbsuite/test/help/TestApropos.py
new file mode 100644
index 00000000000..7b2e69938a0
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/help/TestApropos.py
@@ -0,0 +1,22 @@
+"""
+Test some lldb apropos commands.
+"""
+
+from __future__ import print_function
+
+
+
+import os, time
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+class AproposCommandTestCase(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    @no_debug_info_test
+    def test_apropos_variable(self):
+        """Test that 'apropos variable' prints the fully qualified command name"""
+        self.expect('apropos variable', substrs=['frame variable', 'target variable', 'watchpoint set variable'])
diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp
index bf6cded4e92..34574d46853 100644
--- a/lldb/source/Interpreter/CommandInterpreter.cpp
+++ b/lldb/source/Interpreter/CommandInterpreter.cpp
@@ -2802,7 +2802,7 @@ CommandInterpreter::FindCommandsForApropos (const char *search_word,
                                            search_syntax,
                                            search_options))
         {
-            commands_found.AppendString (command_name);
+            commands_found.AppendString (cmd_obj->GetCommandName());
             commands_help.AppendString (cmd_obj->GetHelp());
         }