Fix: Console auto-completion should take into account parent classes' prototypes

fixes #9843

diff --git a/lib/cli/consolecommand.cpp b/lib/cli/consolecommand.cpp
index e7b96b968840e8f0ee04fabb4aed6153f770ce2a..1ff9cd4f3d7943daef275cbdc982940abd8fa823 100644 (file)
--- a/lib/cli/consolecommand.cpp
+++ b/lib/cli/consolecommand.cpp
@@ -128,14 +128,18 @@ static char *ConsoleCompleteHelper(const char *word, int state)
                                        AddSuggestion(matches, word, pword + "." + field.Name);
                                }
 
-                               Object::Ptr prototype = type->GetPrototype();
-                               Dictionary::Ptr dict = dynamic_pointer_cast<Dictionary>(prototype);
-
-                               if (dict) {
-                                       ObjectLock olock(dict);
-                                       BOOST_FOREACH(const Dictionary::Pair& kv, dict) {
-                                               AddSuggestion(matches, word, pword + "." + kv.first);
+                               while (type) {
+                                       Object::Ptr prototype = type->GetPrototype();
+                                       Dictionary::Ptr dict = dynamic_pointer_cast<Dictionary>(prototype);
+
+                                       if (dict) {
+                                               ObjectLock olock(dict);
+                                               BOOST_FOREACH(const Dictionary::Pair& kv, dict) {
+                                                       AddSuggestion(matches, word, pword + "." + kv.first);
+                                               }
                                        }
+
+                                       type = type->GetBaseType();
                                }
                        } catch (...) { /* Ignore the exception */ }
                }