Changeset 7232 for code/branches/consolecommands3/src/libraries/core

Timestamp:

Aug 27, 2010, 8:41:22 PM (14 years ago)

Author:

landauf

Message:

hide commands and command groups from auto-completion if they are inactive/denied/hidden

File:

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

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

@@ -57 +57 @@
         }
 
+        bool groupIsVisible(const std::map<std::string, _ConsoleCommand*>& group)
+        {
+            for (std::map<std::string, _ConsoleCommand*>::const_iterator it_command = group.begin(); it_command != group.end(); ++it_command)
+                if (it_command->second->isActive() && it_command->second->hasAccess() && !it_command->second->isHidden())
+                    return true;
+
+            return false;
+        }
+
         ARGUMENT_COMPLETION_FUNCTION_IMPLEMENTATION(groupsandcommands)()
         {
@@ -63 +72 @@
             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)
-                // todo: check if active / not hidden / not denied
-                groupList.push_back(ArgumentCompletionListElement(it_group->first, getLowercase(it_group->first)));
+                if (groupIsVisible(it_group->second))
+                    groupList.push_back(ArgumentCompletionListElement(it_group->first, getLowercase(it_group->first)));
 
             std::map<std::string, std::map<std::string, _ConsoleCommand*> >::const_iterator it_group = commands.find("");
@@ -72 +81 @@
 
                 for (std::map<std::string, _ConsoleCommand*>::const_iterator it_command = it_group->second.begin(); it_command != it_group->second.end(); ++it_command)
-                    // todo: check if active / not hidden / not denied
-                    groupList.push_back(ArgumentCompletionListElement(it_command->first, getLowercase(it_command->first)));
+                    if (it_command->second->isActive() && it_command->second->hasAccess() && !it_command->second->isHidden())
+                        groupList.push_back(ArgumentCompletionListElement(it_command->first, getLowercase(it_command->first)));
             }
 
@@ -93 +102 @@
             {
                 for (std::map<std::string, _ConsoleCommand*>::const_iterator it_command = it_group->second.begin(); it_command != it_group->second.end(); ++it_command)
-                    // todo: check if active / not hidden / not denied
-                    commandList.push_back(ArgumentCompletionListElement(it_command->first, getLowercase(it_command->first)));
+                    if (it_command->second->isActive() && it_command->second->hasAccess() && !it_command->second->isHidden())
+                        commandList.push_back(ArgumentCompletionListElement(it_command->first, getLowercase(it_command->first)));
             }