FIX: Renaming a control scheme doesn't correct the bindings to come with it (ISX-1567) (#1740)

* Rename bindings control scheme's when control scheme is renamed

Also refactors this renaming into a helper method.

* Select the updated control scheme or the new one saved

This fixes one failing test for the Editor

Author: jfreire-unity

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using UnityEditor;
 using UnityEngine.InputSystem.Utilities;
 
 namespace UnityEngine.InputSystem.Editor
@@ -32,7 +33,7 @@ public static Command RemoveDeviceRequirement(int selectedDeviceIndex)
             };
         }
 
-        public static Command SaveControlScheme(string newName = "", bool updateExisting = false)
+        public static Command SaveControlScheme(string newControlSchemeName = "", bool updateExisting = false)
         {
             return (in InputActionsEditorState state) =>
             {
@@ -42,7 +43,9 @@ public static Command SaveControlScheme(string newName = "", bool updateExisting
                 var controlScheme = controlSchemesArray
                     .FirstOrDefault(sp => sp.FindPropertyRelative(nameof(InputControlScheme.m_Name)).stringValue == controlSchemeName);
 
-                // if the control scheme is null, we're saving a new control scheme, otherwise editing an existing one
+                var actionMaps = state.serializedObject.FindProperty(nameof(InputActionAsset.m_ActionMaps));
+
+                // If the control scheme is null, we're saving a new control scheme, otherwise editing an existing one
                 if (controlScheme == null && updateExisting)
                     throw new InvalidOperationException("Tried to update a non-existent control scheme.");
 
@@ -52,8 +55,15 @@ public static Command SaveControlScheme(string newName = "", bool updateExisting
                     controlSchemesArray.InsertArrayElementAtIndex(controlSchemesArray.arraySize);
                     controlScheme = controlSchemesArray.GetArrayElementAtIndex(controlSchemesArray.arraySize - 1);
                 }
+                // If we're renaming a control scheme, we need to update the bindings that use it and make a unique name
+                if (!string.IsNullOrEmpty(newControlSchemeName))
+                {
+                    newControlSchemeName = MakeUniqueControlSchemeName(state, newControlSchemeName);
+                    RenameBindingsControlSchemeHelper(controlScheme, actionMaps, controlSchemeName, newControlSchemeName);
+                }
 
-                controlScheme.FindPropertyRelative(nameof(InputControlScheme.m_Name)).stringValue = string.IsNullOrEmpty(newName) ? controlSchemeName  : newName;
+                controlScheme.FindPropertyRelative(nameof(InputControlScheme.m_Name)).stringValue = string.IsNullOrEmpty(newControlSchemeName) ? controlSchemeName  : newControlSchemeName;
+                controlScheme.FindPropertyRelative(nameof(InputControlScheme.m_BindingGroup)).stringValue = string.IsNullOrEmpty(newControlSchemeName) ? controlSchemeName  : newControlSchemeName;
 
                 var serializedDeviceRequirements = controlScheme.FindPropertyRelative(nameof(InputControlScheme.m_DeviceRequirements));
                 serializedDeviceRequirements.ClearArray();
@@ -71,10 +81,34 @@ public static Command SaveControlScheme(string newName = "", bool updateExisting
                 }
 
                 state.serializedObject.ApplyModifiedProperties();
-                return state.With(selectedControlScheme: new InputControlScheme(controlScheme));
+                return state.With(
+                    selectedControlScheme: new InputControlScheme(controlScheme),
+                    // Select the control scheme updated, otherwise select the new one it was added
+                    selectedControlSchemeIndex: updateExisting? state.selectedControlSchemeIndex: controlSchemesArray.arraySize - 1);
             };
         }
 
+        static void RenameBindingsControlSchemeHelper(SerializedProperty controlScheme, SerializedProperty actionMaps, string controlSchemeName, string newName)
+        {
+            foreach (SerializedProperty actionMap in actionMaps)
+            {
+                var bindings = actionMap
+                    .FindPropertyRelative(nameof(InputActionMap.m_Bindings))
+                    .Select(sp => new SerializedInputBinding(sp))
+                    .ToList();
+
+                var bindingsToRename = bindings.Where(b => b.controlSchemes.Contains(controlSchemeName)).ToList();
+
+                foreach (var binding in bindingsToRename)
+                {
+                    var bindingGroups = binding.controlSchemes.ToList();
+                    bindingGroups.Remove(controlSchemeName);
+                    bindingGroups.Add(newName);
+                    binding.wrappedProperty.FindPropertyRelative(nameof(InputBinding.m_Groups)).stringValue = bindingGroups.Join(InputBinding.kSeparatorString);
+                }
+            }
+        }
+
         public static Command SelectControlScheme(int controlSchemeIndex)
         {
             return (in InputActionsEditorState state) =>