Cleanup tests & remove the need for the shortcutkeysconsume input setting.

Author: Darren-Kelly-Unity

Assets/Tests/InputSystem/CoreTests_ActionsPriority.cs

@@ -112,10 +112,8 @@ private void ReleaseBindingsForActions(Keyboard keyboard, InputAction action1, I
     [TestCaseSource(nameof(TwoInputActionTestCases))]
     public void Actions_Priority_OnlyOneActionIsFired_WhenOnePriorityIsHigherThanOther(TwoInputActionDataWrapper<InputAction, InputAction> twoInputActions)
     {
-        InputSystem.settings.shortcutKeysConsumeInput = true;
         var keyboard = InputSystem.AddDevice<Keyboard>();
 
-        //var map = new InputActionMap("map");
         var action1 = twoInputActions.Action1;
         var action2 = twoInputActions.Action2;
 
@@ -137,9 +135,6 @@ public void Actions_Priority_OnlyOneActionIsFired_WhenOnePriorityIsHigherThanOth
         // Cleanup key presses
         ReleaseBindingsForActions(keyboard, action1, action2);
 
-        // Update again to be sure released is true.
-        InputSystem.Update();
-
         Assert.That(action1.WasPerformedThisFrame(), Is.False);
         Assert.That(action2.WasPerformedThisFrame(), Is.False);
     }
@@ -149,7 +144,6 @@ public void Actions_Priority_OnlyOneActionIsFired_WhenOnePriorityIsHigherThanOth
     [TestCaseSource(nameof(TwoInputActionTestCases))]
     public void Actions_Priority_OnlyOneActionIsFired_WhenOnePriorityIsHigherThanOtherInversePriorityOrder(TwoInputActionDataWrapper<InputAction, InputAction> twoInputActions)
     {
-        InputSystem.settings.shortcutKeysConsumeInput = true;
         var keyboard = InputSystem.AddDevice<Keyboard>();
 
         var action1 = twoInputActions.Action1;
@@ -166,10 +160,11 @@ public void Actions_Priority_OnlyOneActionIsFired_WhenOnePriorityIsHigherThanOth
 
         PressBindingsForInputActions(keyboard, action1, action2);
 
-        // action2 is performed because action1 has a higher priority than action2.
+        // action2 is performed because action2 has a higher priority than action1.
         Assert.That(action1.WasPerformedThisFrame(), Is.False);
         Assert.That(action2.WasPerformedThisFrame(), Is.True);
 
+        // Cleanup key presses
         ReleaseBindingsForActions(keyboard, action1, action2);
 
         Assert.That(action1.WasPerformedThisFrame(), Is.False);
@@ -181,7 +176,6 @@ public void Actions_Priority_OnlyOneActionIsFired_WhenOnePriorityIsHigherThanOth
     [TestCaseSource(nameof(TwoInputActionTestCases))] // TODO: Darren, Should both actions be performed this frame here??
     public void Actions_Priority_BothActionsArePerformed_DueToKeyPressOrderForShortcut(TwoInputActionDataWrapper<InputAction, InputAction> twoInputActions)
     {
-        InputSystem.settings.shortcutKeysConsumeInput = true;
         var keyboard = InputSystem.AddDevice<Keyboard>();
 
         // We swap the order here of Action1 & Action2 so key presses are done backwards, binding before modifiers.
@@ -219,7 +213,6 @@ public void Actions_Priority_BothActionsArePerformed_DueToKeyPressOrderForShortc
     [TestCaseSource(nameof(TwoInputActionTestCases))]
     public void Actions_Priority_BothActionFires_WhenPriorityIsEqual(TwoInputActionDataWrapper<InputAction, InputAction> twoInputActions)
     {
-        InputSystem.settings.shortcutKeysConsumeInput = true;
         var keyboard = InputSystem.AddDevice<Keyboard>();
 
         var action1 = twoInputActions.Action1;
@@ -241,7 +234,6 @@ public void Actions_Priority_BothActionFires_WhenPriorityIsEqual(TwoInputActionD
     [TestCaseSource(nameof(TwoInputActionTestCases))]
     public void Actions_Priority_BothActionsFire_WhenPriorityIsZero(TwoInputActionDataWrapper<InputAction, InputAction> twoInputActions)
     {
-        InputSystem.settings.shortcutKeysConsumeInput = true;
         var keyboard = InputSystem.AddDevice<Keyboard>();
 
         var action1 = twoInputActions.Action1;
@@ -293,7 +285,6 @@ private static IEnumerable<TwoInputActionDataWrapper<InputAction, InputAction>>
     [TestCaseSource(nameof(TwoInputActionNoConflictingBindingTestCases))]
     public void Actions_Priority_BothActionsWithDifferentPriorityFire_WhenThereIsNoConflictingBinding(TwoInputActionDataWrapper<InputAction, InputAction> twoInputActions)
     {
-        InputSystem.settings.shortcutKeysConsumeInput = true;
         var keyboard = InputSystem.AddDevice<Keyboard>();
 
         var action1 = twoInputActions.Action1;
@@ -303,8 +294,7 @@ public void Actions_Priority_BothActionsWithDifferentPriorityFire_WhenThereIsNoC
         action2.Priority = 1;
 
         action1.m_ActionMap.Enable();
-        action2.m_ActionMap.Enable();
-        //
+
         var action1WasPerformed = false;
         action1.performed += _ => action1WasPerformed = true;
 
@@ -323,7 +313,6 @@ public void Actions_Priority_BothActionsWithDifferentPriorityFire_WhenThereIsNoC
     [TestCaseSource(nameof(TwoInputActionNoConflictingBindingTestCases))]
     public void Actions_Priority_BothActionsWithDifferentPriorityFire_WhenThereIsNoConflictingBindingInverseOrder(TwoInputActionDataWrapper<InputAction, InputAction> twoInputActions)
     {
-        InputSystem.settings.shortcutKeysConsumeInput = true;
         var keyboard = InputSystem.AddDevice<Keyboard>();
 
         var action1 = twoInputActions.Action1;
@@ -333,8 +322,7 @@ public void Actions_Priority_BothActionsWithDifferentPriorityFire_WhenThereIsNoC
         action2.Priority = 5;
 
         action1.m_ActionMap.Enable();
-        action2.m_ActionMap.Enable();
-        //
+
         var action1WasPerformed = false;
         action1.performed += _ => action1WasPerformed = true;
 
@@ -353,7 +341,6 @@ public void Actions_Priority_BothActionsWithDifferentPriorityFire_WhenThereIsNoC
     [TestCaseSource(nameof(TwoInputActionNoConflictingBindingTestCases))]
     public void Actions_Priority_BothActionsWithEqualPriorityFire_WhenThereIsNoConflictingBinding(TwoInputActionDataWrapper<InputAction, InputAction> twoInputActions)
     {
-        InputSystem.settings.shortcutKeysConsumeInput = true;
         var keyboard = InputSystem.AddDevice<Keyboard>();
 
         var action1 = twoInputActions.Action1;
@@ -363,7 +350,6 @@ public void Actions_Priority_BothActionsWithEqualPriorityFire_WhenThereIsNoConfl
         action2.Priority = 5;
 
         action1.m_ActionMap.Enable();
-        action2.m_ActionMap.Enable();
 
         var action1WasPerformed = false;
         action1.performed += _ => action1WasPerformed = true;

Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs

@@ -146,10 +146,6 @@ private void ComputeControlGroupingIfNecessary()
             if (memory.controlGroupingInitialized)
                 return;
 
-            // If shortcut support is disabled, we simply put put all bindings at complexity=1 and
-            // in their own group.
-            var disableControlGrouping = !InputSystem.settings.shortcutKeysConsumeInput;
-
             var currentGroup = 1u;
 
             for (var i = 0; i < totalControlCount; ++i)
@@ -162,28 +158,25 @@ private void ComputeControlGroupingIfNecessary()
 
                 var action = GetActionOrNull(bindingIndex);
 
-                var priority = Math.Clamp(action != null && !disableControlGrouping ? action.Priority : 0, 0, 65536);
+                var priority = Math.Clamp(action != null ? action.Priority : 0, 0, 65535);
 
                 controlGroupingAndPriority[i * 2 + 1] = (ushort)priority;
 
                 // Compute grouping. If already set, skip.
                 if (controlGroupingAndPriority[i * 2] == 0)
                 {
-                    if (!disableControlGrouping)
+                    for (var n = 0; n < totalControlCount; ++n)
                     {
-                        for (var n = 0; n < totalControlCount; ++n)
-                        {
-                            // NOTE: We could compute group numbers based on device index + control offsets
-                            //       and thus make them work globally in a stable way. But we'd need a mechanism
-                            //       to then determine ordering of actions globally such that it is clear which
-                            //       action gets a first shot at an input.
+                        // NOTE: We could compute group numbers based on device index + control offsets
+                        //       and thus make them work globally in a stable way. But we'd need a mechanism
+                        //       to then determine ordering of actions globally such that it is clear which
+                        //       action gets a first shot at an input.
 
-                            var otherControl = controls[n];
-                            if (control != otherControl)
-                                continue;
+                        var otherControl = controls[n];
+                        if (control != otherControl)
+                            continue;
 
-                            controlGroupingAndPriority[n * 2] = (ushort)currentGroup;
-                        }
+                        controlGroupingAndPriority[n * 2] = (ushort)currentGroup;
                     }
 
                     controlGroupingAndPriority[i * 2] = (ushort)currentGroup;