fix: Limit incomplete EntityID filters to auto-complete, to avoid breaking collection accessing

Author: psyGamer

CelesteTAS-EverestInterop/Source/InfoHUD/TargetQuery.cs

@@ -39,7 +39,7 @@ public virtual (bool CanEnumerate, bool ShouldOverride) CanEnumerateMemberEntrie
         public virtual object[] ResolveInstances(Type type) => [];
 
         /// Can process the query arguments into special members, to allow for custom syntax
-        public virtual IEnumerable<string> ProcessQueryArguments(IEnumerable<string> queryArgs) => queryArgs;
+        public virtual IEnumerable<string> ProcessQueryArguments(IEnumerable<string> queryArgs, bool isAutoComplete) => queryArgs;
         /// Should format the query arguments back into their original custom syntax form
         public virtual IEnumerable<string> FormatQueryArguments(IEnumerable<string> queryArgs) => queryArgs;
 
@@ -514,7 +514,7 @@ internal static IEnumerable<MethodInfo> EnumerateViableMethods(Type type, Varian
 
     internal static IEnumerator<CommandAutoCompleteEntry> ResolveAutoCompleteEntries(string[] queryArgs, Variant variant, Type[]? targetTypeFilter = null) {
         // Process query arguments
-        queryArgs = Handlers.Aggregate((IEnumerable<string>) queryArgs, (current, handler) => handler.ProcessQueryArguments(current)).ToArray();
+        queryArgs = Handlers.Aggregate((IEnumerable<string>) queryArgs, (current, handler) => handler.ProcessQueryArguments(current, isAutoComplete: true)).ToArray();
         // Drop last argument for prefix
         string queryPrefix = queryArgs.Length <= 1 ? string.Empty : string.Join('.', Handlers.Aggregate((IEnumerable<string>) queryArgs[..^1], (current, handler) => handler.FormatQueryArguments(current)));
         string memberQueryPrefix = queryArgs.Length <= 1 ? queryPrefix : $"{queryPrefix}.";
@@ -844,7 +844,7 @@ internal static IEnumerable<string> GetQueryArgs(string[] args, int index) {
         }
 
         return Handlers
-            .Aggregate((IEnumerable<string>) args[index].Split('.'), (current, handler) => handler.ProcessQueryArguments(current))
+            .Aggregate((IEnumerable<string>) args[index].Split('.'), (current, handler) => handler.ProcessQueryArguments(current, isAutoComplete: true))
             // Only skip last part if we're currently editing that
             .SkipLast(args.Length == index + 1 ? 1 : 0);
     }
@@ -859,7 +859,7 @@ public static HashSet<Type> ResolveBaseTypes(string[] queryArgs, out string[] me
         }
 
         if (processArgs) {
-            queryArgs = Handlers.Aggregate((IEnumerable<string>) queryArgs, (current, handler) => handler.ProcessQueryArguments(current)).ToArray();
+            queryArgs = Handlers.Aggregate((IEnumerable<string>) queryArgs, (current, handler) => handler.ProcessQueryArguments(current, isAutoComplete: false)).ToArray();
         }
 
         if (queryArgs.Any(arg => arg == InvalidQueryArgument)) {

CelesteTAS-EverestInterop/Source/InfoHUD/TargetQueryHandlers.cs

@@ -484,7 +484,7 @@ public override (bool CanEnumerate, bool ShouldOverride) CanEnumerateMemberEntri
         return (CanEnumerate: false, ShouldOverride: false);
     }
 
-    public override IEnumerable<string> ProcessQueryArguments(IEnumerable<string> queryArgs) {
+    public override IEnumerable<string> ProcessQueryArguments(IEnumerable<string> queryArgs, bool isAutoComplete) {
         using var enumerator = queryArgs.GetEnumerator();
         while (enumerator.MoveNext()) {
             string arg = enumerator.Current;
@@ -505,7 +505,7 @@ public override IEnumerable<string> ProcessQueryArguments(IEnumerable<string> qu
                     yield return TargetQuery.InvalidQueryArgument;
                     yield break;
                 }
-            } else if (IncompleteEntityIDRegex.Match(arg) is { Success: true} entityIncompleteMatch) {
+            } else if (isAutoComplete && IncompleteEntityIDRegex.Match(arg) is { Success: true } entityIncompleteMatch) {
                 yield return entityIncompleteMatch.Groups[1].Value;
                 yield return IncompleteEntityIDKey;
                 yield return entityIncompleteMatch.Groups[2].Value;
@@ -514,7 +514,7 @@ public override IEnumerable<string> ProcessQueryArguments(IEnumerable<string> qu
                     // Only exists for auto-complete, so disallow arguments following this
                     yield return TargetQuery.InvalidQueryArgument;
                 }
-            } else if (ComponentRegex.Match(arg) is { Success: true} componentMatch) {
+            } else if (ComponentRegex.Match(arg) is { Success: true } componentMatch) {
                 yield return componentMatch.Groups[1].Value;
                 yield return ComponentKey;
                 yield return componentMatch.Groups[2].Value;
@@ -1087,7 +1087,7 @@ internal class CollectionQueryHandler : TargetQuery.Handler {
     private const string SpreadKey = "___SpreadCollection___";
     private const string IndexKey = "___Index___";
 
-    public override IEnumerable<string> ProcessQueryArguments(IEnumerable<string> queryArgs) {
+    public override IEnumerable<string> ProcessQueryArguments(IEnumerable<string> queryArgs, bool isAutoComplete) {
         foreach (string arg in queryArgs) {
             if (arg.EndsWith('*')) {
                 string newArg = arg[..^1];
@@ -1162,6 +1162,7 @@ public override IEnumerable<string> ProcessQueryArguments(IEnumerable<string> qu
             keyType = type.GenericTypeArguments[0];
         }
 
+        // TODO: This supports resolving target-queries, but the query-arg parsing logic does not..
         var keyResult = TargetQuery.ResolveValue([memberArgs[memberIdx][IndexKey.Length..]], [keyType]);
         if (keyResult.CheckFailure(out var error)) {
             value = null;
@@ -1432,7 +1433,7 @@ private class ButtonBindingData {
         } else {
             return Result<bool, TargetQuery.MemberAccessError>.Ok(false);
         }
-        
+
         var nodes = button.Nodes;
         var mouseButtons = button.Binding.Mouse;
         var data = (ButtonBindingData) value!;
@@ -1545,7 +1546,7 @@ public override IEnumerator<CommandAutoCompleteEntry> EnumerateTypeEntries(Type
                     // Only ASCII alphabet is allowed
                     continue;
                 }
-                
+
                 yield return new CommandAutoCompleteEntry {
                     Name = key.ToString(),
                     Extra = "Key",