tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 22:54:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
fixes #9843
This commit is contained in:
Gunnar Beutner 2015-08-26 09:02:31 +02:00
parent f8a26d810c
commit 2109944580
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/cli/consolecommand.cpp
View File

@ -128,14 +128,18 @@ static char *ConsoleCompleteHelper(const char *word, int state)
AddSuggestion(matches, word, pword + "." + field.Name); AddSuggestion(matches, word, pword + "." + field.Name);
} }
Object::Ptr prototype = type->GetPrototype(); while (type) {
Dictionary::Ptr dict = dynamic_pointer_cast<Dictionary>(prototype); Object::Ptr prototype = type->GetPrototype();
Dictionary::Ptr dict = dynamic_pointer_cast<Dictionary>(prototype);
if (dict) { if (dict) {
ObjectLock olock(dict); ObjectLock olock(dict);
BOOST_FOREACH(const Dictionary::Pair& kv, dict) { BOOST_FOREACH(const Dictionary::Pair& kv, dict) {
AddSuggestion(matches, word, pword + "." + kv.first); AddSuggestion(matches, word, pword + "." + kv.first);
}
} }
type = type->GetBaseType();
} }
} catch (...) { /* Ignore the exception */ } } catch (...) { /* Ignore the exception */ }
} }