FIX: Renaming an input action should not consider action being renamed for uniqueness (#1551)

Co-authored-by: Håkan Sidenvall <[email protected]>

Author: andrew-oc

Assets/Tests/InputSystem/CoreTests_Editor.cs

@@ -2339,6 +2339,7 @@ public void Editor_RenamingAction_WillAutomaticallyEnsureUniqueNames()
         var map = new InputActionMap("set1");
         map.AddAction("actionA", binding: "<Gamepad>/leftStick");
         map.AddAction("actionB");
+        map.AddAction("A");
         var asset = ScriptableObject.CreateInstance<InputActionAsset>();
         asset.AddActionMap(map);
 
@@ -2353,6 +2354,14 @@ public void Editor_RenamingAction_WillAutomaticallyEnsureUniqueNames()
         Assert.That(map.actions[0].name, Is.EqualTo("actionB1"));
         Assert.That(map.actions[0].bindings, Has.Count.EqualTo(1));
         Assert.That(map.actions[0].bindings[0].action, Is.EqualTo("actionB1"));
+
+        // now check that unique renaming ignores the action being renamed, so A can be renamed to a and not a1.
+        var actionAProperty = mapProperty.FindPropertyRelative("m_Actions").GetArrayElementAtIndex(2);
+
+        InputActionSerializationHelpers.RenameAction(actionAProperty, mapProperty, "a");
+        obj.ApplyModifiedPropertiesWithoutUndo();
+
+        Assert.That(map.actions[2].name, Is.EqualTo("a"));
     }
 
     [Test]

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -78,6 +78,7 @@ however, it has to be formatted properly to pass verification tests.
 ### Fixed
 - Fix UI sometimes ignoring the first mouse click event after losing and regaining focus ([case ISXB-127](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-127).
 - Fixed issue when using MultiplayerEventSystems where the visual state of UI controls would change due to constant toggling of CanvasGroup.interactable on and off ([case ISXB-112](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-112)).
+- Fixed minor issue when renaming input actions where unique renaming would incorrectly consider the input action being renamed as a different action and not allow renaming of 'A' to 'a' without appending a unique integer for example ([case ISXB-25](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-25)).
 - Fixed an issue where the Input Action asset icon would not be visible during asset creation ([case ISXB-6](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-6)).
 - Fixed DualSense low frequency motor speed being always set to min value.
 - Fixed an issue where `ReadUnprocessedValueFromState` in PoseControl always returning default values.

Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs

@@ -416,7 +416,7 @@ public static void RenameAction(SerializedProperty actionProperty, SerializedPro
         {
             // Make sure name is unique.
             var actionsArrayProperty = actionMapProperty.FindPropertyRelative("m_Actions");
-            var uniqueName = FindUniqueName(actionsArrayProperty, newName);
+            var uniqueName = FindUniqueName(actionsArrayProperty, newName, actionProperty.GetIndexOfArrayElement());
 
             // Update all bindings that refer to the action.
             var nameProperty = actionProperty.FindPropertyRelative("m_Name");