Changeset 7235 for code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionFunctions.cc

Timestamp:

Aug 28, 2010, 1:25:04 AM (14 years ago)

Author:

landauf

Message:

• fixed error if a command doesn't exist not being shown while using auto-completion
• fixed error if a command doesn't exist not being redirected to sub-command auto-completion
• fixed unneeded line-breaks in auto-completion list

File:

• code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) (6 diffs)

code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionFunctions.cc

@@ -69 +69 @@
             }
 
-            ArgumentCompletionList _groupsandcommands(bool bOnlyShowHidden)
+            ArgumentCompletionList _groupsandcommands(const std::string& fragment, bool bOnlyShowHidden)
             {
                 ArgumentCompletionList groupList;
+                std::string fragmentLC = getLowercase(fragment);
 
                 const std::map<std::string, std::map<std::string, _ConsoleCommand*> >& commands = _ConsoleCommand::getCommands();
                 for (std::map<std::string, std::map<std::string, _ConsoleCommand*> >::const_iterator it_group = commands.begin(); it_group != commands.end(); ++it_group)
-                    if (groupIsVisible(it_group->second, bOnlyShowHidden) && it_group->first != "")
+                    if (groupIsVisible(it_group->second, bOnlyShowHidden) && it_group->first != "" && (fragmentLC == "" || getLowercase(it_group->first).find_first_of(fragmentLC) == 0))
                         groupList.push_back(ArgumentCompletionListElement(it_group->first, getLowercase(it_group->first)));
 
@@ -81 +82 @@
                 if (it_group != commands.end())
                 {
-                    groupList.push_back(ArgumentCompletionListElement("", "", "\n"));
+                    if (!groupList.empty())
+                        groupList.push_back(ArgumentCompletionListElement("", "", "\n"));
 
                     for (std::map<std::string, _ConsoleCommand*>::const_iterator it_command = it_group->second.begin(); it_command != it_group->second.end(); ++it_command)
-                        if (it_command->second->isActive() && it_command->second->hasAccess() && (!it_command->second->isHidden())^bOnlyShowHidden)
+                        if (it_command->second->isActive() && it_command->second->hasAccess() && (!it_command->second->isHidden())^bOnlyShowHidden && (fragmentLC == "" || getLowercase(it_command->first).find_first_of(fragmentLC) == 0))
                             groupList.push_back(ArgumentCompletionListElement(it_command->first, getLowercase(it_command->first)));
                 }
+
+                if (!groupList.empty() && groupList.back().getDisplay() == "\n")
+                    groupList.pop_back();
 
                 return groupList;
@@ -113 +118 @@
         }
 
-        ARGUMENT_COMPLETION_FUNCTION_IMPLEMENTATION(groupsandcommands)()
-        {
-            return detail::_groupsandcommands(false);
+        ARGUMENT_COMPLETION_FUNCTION_IMPLEMENTATION(groupsandcommands)(const std::string& fragment)
+        {
+            return detail::_groupsandcommands(fragment, false);
         }
 
@@ -128 +133 @@
             const std::string& hint = evaluation.hint();
 
-            if (evaluation.getPossibleArguments().size() > 0)
+            if (evaluation.getPossibleArguments().size() > 0 && evaluation.getPossibleArgumentsSize() > 0)
             {
                 return evaluation.getPossibleArguments();
@@ -145 +150 @@
 
             if (tokens.size() == 0)
-                return detail::_groupsandcommands(true);
+                return detail::_groupsandcommands(fragment, true);
 
             if (_ConsoleCommand::getCommandLC(getLowercase(tokens[0])))
@@ -156 +161 @@
                     return detail::_subcommands(fragment, tokens[0], true);
                 else
-                    return detail::_groupsandcommands(true);
+                    return detail::_groupsandcommands(fragment, true);
             }