Reduce allocation overhead of KeyCombination constructor

ppy · Jan 11, 2024 · 7641f70 · 7641f70
1 parent d16d899
commit 7641f70
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/osu.Framework/Input/Bindings/KeyCombination.cs b/osu.Framework/Input/Bindings/KeyCombination.cs
@@ -29,10 +29,20 @@ namespace osu.Framework.Input.Bindings
         /// Construct a new instance.
         /// </summary>
         /// <param name="keys">The keys.</param>
-        /// <remarks>This constructor is not optimized. Hot paths are assumed to use <see cref="FromInputState(InputState, Vector2?)"/>.</remarks>
         public KeyCombination(IEnumerable<InputKey>? keys)
         {
-            Keys = keys?.Any() == true ? keys.Distinct().OrderBy(k => (int)k).ToImmutableArray() : none;
+            if (keys == null || !keys.Any())
+            {
+                Keys = ImmutableArray<InputKey>.Empty;
+                return;
+            }
+
+            var keyBuilder = ImmutableArray.CreateBuilder<InputKey>(keys.Count());
+
+            keyBuilder.AddRange(keys);
+            keyBuilder.Sort();
+
+            Keys = keyBuilder.MoveToImmutable();
         }
 
         /// <summary>
@@ -643,8 +653,7 @@ public static KeyCombination FromInputState(InputState state, Vector2? scrollDel
             }
 
             Debug.Assert(!keys.Contains(InputKey.None)); // Having None in pressed keys will break IsPressed
-            keys.Sort();
-            return new KeyCombination(keys.ToImmutable());
+            return new KeyCombination(keys);
         }
     }