Fix resource leaks in Input Actions Editor window. (#1909)

FIX: Fixed Input Actions Editor window resource leak that could result in unexpected exceptions ISXB-865

---------

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

Author: AlexTyrer

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -18,6 +18,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed DualSense Edge's vibration and light bar not working on Windows
 - Fixed Project-wide Actions asset failing to reload properly after deleting project's Library folder.
 - Fixed an issue where `System.InvalidOperationException` is thrown when entering PlayMode after deleting an ActionMap from Project-wide actions and later resetting it.
+- Fixed Input Actions Editor window resource leak that could result in unexpected exceptions [ISXB-865](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-865).
 
 ### Changed
 - For Unity 6.0 and above, when an `EventSystem` GameObject is created in the Editor it will have the

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs

@@ -10,6 +10,8 @@ namespace UnityEngine.InputSystem.Editor
 {
     internal class InputActionsEditorSettingsProvider : SettingsProvider
     {
+        private static InputActionsEditorSettingsProvider s_Provider;
+
         public static string SettingsPath => InputSettingsPath.kSettingsRootPath;
 
         [SerializeField] InputActionsEditorState m_State;
@@ -106,11 +108,11 @@ private void OnEditFocus(FocusInEvent @event)
 
         void SaveAssetOnFocusLost()
         {
-            #if UNITY_INPUT_SYSTEM_INPUT_ACTIONS_EDITOR_AUTO_SAVE_ON_FOCUS_LOST
+#if UNITY_INPUT_SYSTEM_INPUT_ACTIONS_EDITOR_AUTO_SAVE_ON_FOCUS_LOST
             var asset = GetAsset();
             if (asset != null)
                 ValidateAndSaveAsset(asset);
-            #endif
+#endif
         }
 
         public static void SetIMGUIDropdownVisible(bool visible, bool optionWasSelected)
@@ -162,14 +164,14 @@ private void OnEditFocusLost(FocusOutEvent @event)
 
         private void OnStateChanged(InputActionsEditorState newState)
         {
-            #if UNITY_INPUT_SYSTEM_INPUT_ACTIONS_EDITOR_AUTO_SAVE_ON_FOCUS_LOST
+#if UNITY_INPUT_SYSTEM_INPUT_ACTIONS_EDITOR_AUTO_SAVE_ON_FOCUS_LOST
             // No action, auto-saved on edit-focus lost
-            #else
+#else
             // Project wide input actions always auto save - don't check the asset auto save status
             var asset = GetAsset();
             if (asset != null)
                 ValidateAndSaveAsset(asset);
-            #endif
+#endif
         }
 
         private void ValidateAndSaveAsset(InputActionAsset asset)
@@ -235,23 +237,18 @@ private void BuildUI()
 
             // Remove input action editor if already present
             {
-                VisualElement element;
-                do
-                {
-                    element = m_RootVisualElement.Q("action-editor");
-                    if (element != null)
-                        m_RootVisualElement.Remove(element);
-                }
-                while (element != null);
+                VisualElement element = m_RootVisualElement.Q("action-editor");
+                if (element != null)
+                    m_RootVisualElement.Remove(element);
             }
 
             // If the editor is associated with an asset we show input action editor
             if (hasAsset)
             {
-                m_StateContainer = new StateContainer(m_RootVisualElement, m_State);
+                m_StateContainer = new StateContainer(m_State);
                 m_StateContainer.StateChanged += OnStateChanged;
                 m_View = new InputActionsEditorView(m_RootVisualElement, m_StateContainer, true, null);
-                m_StateContainer.Initialize();
+                m_StateContainer.Initialize(m_RootVisualElement.Q("action-editor"));
             }
         }
 
@@ -289,7 +286,10 @@ private void ModeChanged(PlayModeStateChange change)
         [SettingsProvider]
         public static SettingsProvider CreateGlobalInputActionsEditorProvider()
         {
-            return new InputActionsEditorSettingsProvider(SettingsPath, SettingsScope.Project);
+            if (s_Provider == null)
+                s_Provider = new InputActionsEditorSettingsProvider(SettingsPath, SettingsScope.Project);
+
+            return s_Provider;
         }
 
         #region Shortcuts

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs

@@ -7,6 +7,8 @@
 using UnityEditor.Callbacks;
 using UnityEditor.PackageManager.UI;
 using UnityEditor.ShortcutManagement;
+using UnityEngine.UIElements;
+using UnityEditor.UIElements;
 
 namespace UnityEngine.InputSystem.Editor
 {
@@ -212,15 +214,15 @@ private void BuildUI()
         {
             CleanupStateContainer();
 
-            m_StateContainer = new StateContainer(rootVisualElement, m_State);
+            m_StateContainer = new StateContainer(m_State);
             m_StateContainer.StateChanged += OnStateChanged;
 
             rootVisualElement.Clear();
             if (!rootVisualElement.styleSheets.Contains(InputActionsEditorWindowUtils.theme))
                 rootVisualElement.styleSheets.Add(InputActionsEditorWindowUtils.theme);
             m_View = new InputActionsEditorView(rootVisualElement, m_StateContainer, false, Save);
 
-            m_StateContainer.Initialize();
+            m_StateContainer.Initialize(rootVisualElement.Q("action-editor"));
         }
 
         private void OnStateChanged(InputActionsEditorState newState)

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/StateContainer.cs

@@ -11,20 +11,12 @@ internal class StateContainer
     {
         public event Action<InputActionsEditorState> StateChanged;
 
-        private readonly VisualElement m_RootVisualElement;
+        private VisualElement m_RootVisualElement;
         private InputActionsEditorState m_State;
 
-        public StateContainer(VisualElement rootVisualElement, InputActionsEditorState initialState)
+        public StateContainer(InputActionsEditorState initialState)
         {
-            m_RootVisualElement = rootVisualElement;
             m_State = initialState;
-
-            rootVisualElement.Unbind();
-            m_RootVisualElement.TrackSerializedObjectValue(initialState.serializedObject, so =>
-            {
-                StateChanged?.Invoke(m_State);
-            });
-            rootVisualElement.Bind(initialState.serializedObject);
         }
 
         public void Dispatch(Command command)
@@ -51,9 +43,20 @@ public void Dispatch(Command command)
             });
         }
 
-        public void Initialize()
+        public void Initialize(VisualElement rootVisualElement)
         {
+            // We need to use a root element for the TrackSerializedObjectValue that is destroyed with the view.
+            // Using a root element from the settings window would not enable the tracking callback to be destroyed or garbage collected.
+
+            m_RootVisualElement = rootVisualElement;
+
+            m_RootVisualElement.Unbind();
+            m_RootVisualElement.TrackSerializedObjectValue(m_State.serializedObject, so =>
+            {
+                StateChanged?.Invoke(m_State);
+            });
             StateChanged?.Invoke(m_State);
+            rootVisualElement.Bind(m_State.serializedObject);
         }
 
         /// <summary>