Fix exact match not matching expectations

osu.Framework.Tests/Input/KeyCombinationModifierTest.cs

···
         private static readonly object[][] key_combination_display_test_cases =
         {
             // test single combination matches.
-            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.LShift), false, true },
-            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.RShift), false, true },
-            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.Shift), false, true },
-            new object[] { new KeyCombination(InputKey.LShift), new KeyCombination(InputKey.RShift), false, false },
-            new object[] { new KeyCombination(InputKey.RShift), new KeyCombination(InputKey.RShift), false, true },
+            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.LShift), KeyCombinationMatchingMode.Any, true },
+            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.RShift), KeyCombinationMatchingMode.Any, true },
+            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.Shift), KeyCombinationMatchingMode.Any, true },
+            new object[] { new KeyCombination(InputKey.LShift), new KeyCombination(InputKey.RShift), KeyCombinationMatchingMode.Any, false },
+            new object[] { new KeyCombination(InputKey.RShift), new KeyCombination(InputKey.RShift), KeyCombinationMatchingMode.Any, true },
 
-            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.LShift), true, true },
-            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.RShift), true, true },
-            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.Shift), true, true },
-            new object[] { new KeyCombination(InputKey.LShift), new KeyCombination(InputKey.RShift), true, false },
-            new object[] { new KeyCombination(InputKey.RShift), new KeyCombination(InputKey.RShift), true, true },
+            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.LShift), KeyCombinationMatchingMode.Exact, true },
+            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.RShift), KeyCombinationMatchingMode.Exact, true },
+            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.Shift), KeyCombinationMatchingMode.Exact, true },
+            new object[] { new KeyCombination(InputKey.LShift), new KeyCombination(InputKey.RShift), KeyCombinationMatchingMode.Exact, false },
+            new object[] { new KeyCombination(InputKey.RShift), new KeyCombination(InputKey.RShift), KeyCombinationMatchingMode.Exact, true },
+
+            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.LShift), KeyCombinationMatchingMode.Modifiers, true },
+            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.RShift), KeyCombinationMatchingMode.Modifiers, true },
+            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.Shift), KeyCombinationMatchingMode.Modifiers, true },
+            new object[] { new KeyCombination(InputKey.LShift), new KeyCombination(InputKey.RShift), KeyCombinationMatchingMode.Modifiers, false },
+            new object[] { new KeyCombination(InputKey.RShift), new KeyCombination(InputKey.RShift), KeyCombinationMatchingMode.Modifiers, true },
 
             // test multiple combination matches.
-            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.Shift, InputKey.LShift), false, true },
-            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.Shift, InputKey.RShift), false, true },
-            new object[] { new KeyCombination(InputKey.LShift), new KeyCombination(InputKey.Shift, InputKey.RShift), false, false },
-            new object[] { new KeyCombination(InputKey.RShift), new KeyCombination(InputKey.Shift, InputKey.RShift), false, true },
+            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.Shift, InputKey.LShift), KeyCombinationMatchingMode.Any, true },
+            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.Shift, InputKey.RShift), KeyCombinationMatchingMode.Any, true },
+            new object[] { new KeyCombination(InputKey.LShift), new KeyCombination(InputKey.Shift, InputKey.RShift), KeyCombinationMatchingMode.Any, false },
+            new object[] { new KeyCombination(InputKey.RShift), new KeyCombination(InputKey.Shift, InputKey.RShift), KeyCombinationMatchingMode.Any, true },
+
+            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.Shift, InputKey.LShift), KeyCombinationMatchingMode.Exact, true },
+            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.Shift, InputKey.RShift), KeyCombinationMatchingMode.Exact, true },
+            new object[] { new KeyCombination(InputKey.LShift), new KeyCombination(InputKey.Shift, InputKey.RShift), KeyCombinationMatchingMode.Exact, false },
+            new object[] { new KeyCombination(InputKey.RShift), new KeyCombination(InputKey.Shift, InputKey.RShift), KeyCombinationMatchingMode.Exact, true },
 
-            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.Shift, InputKey.LShift), true, true },
-            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.Shift, InputKey.RShift), true, true },
-            new object[] { new KeyCombination(InputKey.LShift), new KeyCombination(InputKey.Shift, InputKey.RShift), true, false },
-            new object[] { new KeyCombination(InputKey.RShift), new KeyCombination(InputKey.Shift, InputKey.RShift), true, true },
+            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.Shift, InputKey.LShift), KeyCombinationMatchingMode.Modifiers, true },
+            new object[] { new KeyCombination(InputKey.Shift), new KeyCombination(InputKey.Shift, InputKey.RShift), KeyCombinationMatchingMode.Modifiers, true },
+            new object[] { new KeyCombination(InputKey.LShift), new KeyCombination(InputKey.Shift, InputKey.RShift), KeyCombinationMatchingMode.Modifiers, false },
+            new object[] { new KeyCombination(InputKey.RShift), new KeyCombination(InputKey.Shift, InputKey.RShift), KeyCombinationMatchingMode.Modifiers, true },
         };
 
         [TestCaseSource(nameof(key_combination_display_test_cases))]
-        public void TestLeftRightModifierHandling(KeyCombination candidate, KeyCombination pressed, bool exactModifiers, bool shouldContain)
-            => Assert.AreEqual(shouldContain, KeyCombination.ContainsAll(candidate.Keys, pressed.Keys, exactModifiers));
+        public void TestLeftRightModifierHandling(KeyCombination candidate, KeyCombination pressed, KeyCombinationMatchingMode matchingMode, bool shouldContain)
+            => Assert.AreEqual(shouldContain, KeyCombination.ContainsAll(candidate.Keys, pressed.Keys, matchingMode));
     }
 }

osu.Framework/Input/Bindings/KeyCombination.cs

···
             if (Keys == pressedKeys.Keys) // Fast test for reference equality of underlying array
                 return true;
 
-            switch (matchingMode)
-            {
-                case KeyCombinationMatchingMode.Any:
-                    return ContainsAll(pressedKeys.Keys, Keys, false);
-
-                case KeyCombinationMatchingMode.Exact:
-                    // Keys are always ordered
-                    return pressedKeys.Keys.SequenceEqual(Keys);
-
-                case KeyCombinationMatchingMode.Modifiers:
-                    return ContainsAll(pressedKeys.Keys, Keys, true);
-
-                default:
-                    return false;
-            }
+            return ContainsAll(pressedKeys.Keys, Keys, matchingMode);
         }
 
         /// <summary>
···
         /// </summary>
         /// <param name="pressedKey">The keys which have been pressed by a user.</param>
         /// <param name="candidateKey">The candidate key binding to match against.</param>
-        /// <param name="exactModifiers">Whether exact matching should be used (ie. no excess modifier keys can be pressed).</param>
+        /// <param name="matchingMode">The matching mode to be used when checking.</param>
         /// <returns>Whether this is a match.</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static bool ContainsAll(ImmutableArray<InputKey> pressedKey, ImmutableArray<InputKey> candidateKey, bool exactModifiers)
+        internal static bool ContainsAll(ImmutableArray<InputKey> pressedKey, ImmutableArray<InputKey> candidateKey, KeyCombinationMatchingMode matchingMode)
         {
             // can be local function once attribute on local functions are implemented
             // optimized to avoid allocation
···
                     return false;
             }
 
-            if (exactModifiers)
+            switch (matchingMode)
             {
-                foreach (var key in pressedKey)
-                {
-                    if (IsModifierKey(key) && !ContainsKey(candidateKey, key))
-                        return false;
-                }
+                case KeyCombinationMatchingMode.Exact:
+                    foreach (var key in pressedKey)
+                    {
+                        if (!ContainsKey(candidateKey, key))
+                            return false;
+                    }
+
+                    break;
+
+                case KeyCombinationMatchingMode.Modifiers:
+                    foreach (var key in pressedKey)
+                    {
+                        if (IsModifierKey(key) && !ContainsKey(candidateKey, key))
+                            return false;
+                    }
+
+                    break;
             }
 
             return true;