enum command parameter now supports namespaces to distinguish between Enums with same names.

Author: DavidF-Dev

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 - Added LogException methods.
 - Changed the size of the input field so that the text is larger.
+- Changed enum command parameter to support namespaces to distinguish between enums with same names.
 - Fixed strings being displayed incorrectly by cs_evaluate.
 - Fixed issue with cached enum types.
 

Runtime/DevConsoleMono.cs

@@ -1512,37 +1512,66 @@ private void InitBuiltInCommands()
                     // Check if the enum type was cached
                     Type enumType = _cacheEnumTypes.FirstOrDefault(t => t.Name.Equals(s));
 
+#if INPUT_SYSTEM_INSTALLED
+                    // Special case for Key
+                    if (s.Equals("Key"))
+                    {
+                        enumType = typeof(Key);
+                    }
+#endif
+
                     if (enumType == null)
                     {
+                        List<Type> options = new List<Type>();
+
                         // Search all loaded assemblies for the enum
                         foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
                         {
                             enumType = assembly.GetTypes()
                                 .SelectMany(t => t.GetMembers())
                                 .Union(assembly.GetTypes())
-                                .FirstOrDefault(t => t.ReflectedType != null && t.ReflectedType.IsEnum && t.ReflectedType.Name.Equals(s))
+                                .FirstOrDefault(t => t.ReflectedType != null && t.ReflectedType.IsEnum && (t.ReflectedType.Name.Equals(s) || s.Equals($"{t.ReflectedType.Namespace}.{t.ReflectedType.Name}")))
                                 ?.ReflectedType;
 
                             if (enumType != null)
                             {
-                                // Cache the type
-                                _cacheEnumTypes.Add(enumType);
-                                if (_cacheEnumTypes.Count > MaxCachedEnumTypes)
+                                if (s.Equals($"{enumType.Namespace}.{enumType.Name}"))
                                 {
-                                    _cacheEnumTypes.RemoveAt(0);
+                                    options = new List<Type>() { enumType };
+                                    break;
                                 }
-                                break;
+
+                                options.Add(enumType);
                             }
                         }
-                    }
 
-                    if (enumType == null)
-                    {
-                        LogError($"Could not find enum type with the specified name: \"{s}\"");
-                        return;
+                        if (options.Count > 1)
+                        {
+                            LogError($"Multiple results found: {string.Join(", ", options.Select(x => $"{x.Namespace}.{x.Name}"))}.");
+                            return;
+                        }
+
+                        else if (options.Count == 1)
+                        {
+                            // Select the first type
+                            enumType = options.FirstOrDefault();
+
+                            // Cache the type
+                            _cacheEnumTypes.Add(enumType);
+                            if (_cacheEnumTypes.Count > MaxCachedEnumTypes)
+                            {
+                                _cacheEnumTypes.RemoveAt(0);
+                            }
+                        }
+
+                        else
+                        {
+                            LogError($"Could not find enum type with the specified name: \"{s}\"");
+                            return;
+                        }
                     }
 
-                    LogSeperator($"{enumType.Name} ({enumType.GetEnumUnderlyingType().Name}){(enumType.GetCustomAttribute(typeof(FlagsAttribute)) == null ? "" : " [Flags]")}");
+                    LogSeperator($"{enumType.Namespace}.{enumType.Name} ({enumType.GetEnumUnderlyingType().Name}){(enumType.GetCustomAttribute(typeof(FlagsAttribute)) == null ? "" : " [Flags]")}");
 
                     FieldInfo[] values = enumType.GetFields();
                     string formattedValues = string.Empty;