FIX: exception on renaming control scheme (ISX-1544) (#1722)

* fixed exception on renaming control scheme

* added explanation comments

* format fix

* refactored and fixed canceling renaming of control schemes

* clean up before merge

Author: ritamerkl

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

@@ -32,7 +32,7 @@ public static Command RemoveDeviceRequirement(int selectedDeviceIndex)
             };
         }
 
-        public static Command SaveControlScheme(bool updateExisting = false)
+        public static Command SaveControlScheme(string newName = "", bool updateExisting = false)
         {
             return (in InputActionsEditorState state) =>
             {
@@ -53,7 +53,7 @@ public static Command SaveControlScheme(bool updateExisting = false)
                     controlScheme = controlSchemesArray.GetArrayElementAtIndex(controlSchemesArray.arraySize - 1);
                 }
 
-                controlScheme.FindPropertyRelative(nameof(InputControlScheme.m_Name)).stringValue = controlSchemeName;
+                controlScheme.FindPropertyRelative(nameof(InputControlScheme.m_Name)).stringValue = string.IsNullOrEmpty(newName) ? controlSchemeName  : newName;
 
                 var serializedDeviceRequirements = controlScheme.FindPropertyRelative(nameof(InputControlScheme.m_DeviceRequirements));
                 serializedDeviceRequirements.ClearArray();
@@ -71,8 +71,7 @@ public static Command SaveControlScheme(bool updateExisting = false)
                 }
 
                 state.serializedObject.ApplyModifiedProperties();
-
-                return state.With(selectedControlSchemeIndex: controlSchemesArray.arraySize - 1);
+                return state.With(selectedControlScheme: new InputControlScheme(controlScheme));
             };
         }
 
@@ -137,7 +136,7 @@ public static Command DeleteSelectedControlScheme()
             };
         }
 
-        private static string MakeUniqueControlSchemeName(InputActionsEditorState state, string name)
+        internal static string MakeUniqueControlSchemeName(InputActionsEditorState state, string name)
         {
             var controlSchemes = state.serializedObject.FindProperty(nameof(InputActionAsset.m_ControlSchemes));
 
@@ -165,15 +164,6 @@ public static Command ChangeDeviceRequirement(int deviceRequirementIndex, bool i
             };
         }
 
-        public static Command ChangeSelectedControlSchemeName(string controlSchemeName)
-        {
-            return (in InputActionsEditorState state) => state.With(
-                selectedControlScheme: new InputControlScheme(
-                    controlSchemeName,
-                    state.selectedControlScheme.deviceRequirements,
-                    state.selectedControlScheme.m_BindingGroup));
-        }
-
         public static Command ReorderDeviceRequirements(int oldPosition, int newPosition)
         {
             return (in InputActionsEditorState state) =>

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs

@@ -1,4 +1,5 @@
 #if UNITY_EDITOR && UNITY_INPUT_SYSTEM_UI_TK_ASSET_EDITOR
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
@@ -9,6 +10,10 @@ namespace UnityEngine.InputSystem.Editor
 {
     internal class ControlSchemesView : ViewBase<InputControlScheme>
     {
+        //is used to save the new name of the control scheme when renaming
+        private string m_NewName;
+        public event Action<ViewBase<InputControlScheme>> OnClosing;
+
         public ControlSchemesView(VisualElement root, StateContainer stateContainer, bool updateExisting = false)
             : base(stateContainer)
         {
@@ -25,7 +30,12 @@ public ControlSchemesView(VisualElement root, StateContainer stateContainer, boo
             controlSchemeVisualElement.Q<Button>(kSaveButton).clicked += SaveAndClose;
             controlSchemeVisualElement.Q<TextField>(kControlSchemeNameTextField).RegisterCallback<FocusOutEvent>(evt =>
             {
-                Dispatch(ControlSchemeCommands.ChangeSelectedControlSchemeName(((TextField)evt.currentTarget).value));
+                Dispatch((in InputActionsEditorState state) =>
+                {
+                    m_NewName = ControlSchemeCommands.MakeUniqueControlSchemeName(state,
+                        ((TextField)evt.currentTarget).value);
+                    return state.With(selectedControlScheme: state.selectedControlScheme);
+                });
             });
 
             m_ModalWindow = new VisualElement
@@ -102,10 +112,16 @@ public override void DestroyView()
 
         private void SaveAndClose()
         {
-            Dispatch(ControlSchemeCommands.SaveControlScheme(m_UpdateExisting));
+            Dispatch(ControlSchemeCommands.SaveControlScheme(m_NewName, m_UpdateExisting));
             Close();
         }
 
+        private void Close()
+        {
+            m_NewName = "";
+            OnClosing?.Invoke(this);
+        }
+
         private VisualElement MakeRequiredCell()
         {
             var ve = new VisualElement

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs

@@ -18,8 +18,6 @@ internal interface IView
 
     internal abstract class ViewBase<TViewState> : IView
     {
-        public event Action<ViewBase<TViewState>> OnClosing;
-
         protected ViewBase(StateContainer stateContainer)
         {
             this.stateContainer = stateContainer;
@@ -56,11 +54,6 @@ public TView CreateChildView<TView>(TView view) where TView : IView
             return view;
         }
 
-        public void Close()
-        {
-            OnClosing?.Invoke(this);
-        }
-
         public void DestroyChildView<TView>(TView view) where TView : IView
         {
             if (view == null)