CHANGE: Auto-save on focus lost can no longer be compiled out (#2282)

Author: K-Tone

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -13,6 +13,7 @@ however, it has to be formatted properly to pass verification tests.
 ### Changed
 - Project-Wide Input Actions support can no longer be disabled (removed the UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS define). (ISX-2397)
 - Removed code that had to do with Unity versions older than Unity 2022.3 LTS. (ISX-2396)
+- Auto-save on focus lost can no longer be compiled out (ISX-2397)
 
 ### Fixed
 - An issue where a UITK MouseEvent was triggered when changing from Scene View to Game View in the Editor has been fixed. [ISXB-1671](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1671)

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

@@ -118,11 +118,9 @@ private void OnFocusIn(FocusInEvent @event = null)
 
         void SaveAssetOnFocusLost()
         {
-#if UNITY_INPUT_SYSTEM_INPUT_ACTIONS_EDITOR_AUTO_SAVE_ON_FOCUS_LOST
             var asset = GetAsset();
             if (asset != null)
                 ValidateAndSaveAsset(asset);
-#endif
         }
 
         public static void SetIMGUIDropdownVisible(bool visible, bool optionWasSelected)
@@ -175,18 +173,6 @@ private void OnFocusOut(FocusOutEvent @event = null)
             DelayFocusLost(element == null);
         }
 
-        private void OnStateChanged(InputActionsEditorState newState, UIRebuildMode editorRebuildMode)
-        {
-#if UNITY_INPUT_SYSTEM_INPUT_ACTIONS_EDITOR_AUTO_SAVE_ON_FOCUS_LOST
-            // No action, auto-saved on edit-focus lost
-#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
-        }
-
         private void ValidateAndSaveAsset(InputActionAsset asset)
         {
             ProjectWideActionsAsset.Verify(asset); // Ignore verification result for save
@@ -259,7 +245,6 @@ private void BuildUI()
             if (hasAsset)
             {
                 m_StateContainer = new StateContainer(m_State, AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(asset)));
-                m_StateContainer.StateChanged += OnStateChanged;
                 m_View = new InputActionsEditorView(m_RootVisualElement, m_StateContainer, true, null);
                 m_StateContainer.Initialize(m_RootVisualElement.Q("action-editor"));
             }

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

@@ -267,14 +267,6 @@ private void OnStateChanged(InputActionsEditorState newState, UIRebuildMode edit
         {
             DirtyInputActionsEditorWindow(newState);
             m_State = newState;
-
-            #if UNITY_INPUT_SYSTEM_INPUT_ACTIONS_EDITOR_AUTO_SAVE_ON_FOCUS_LOST
-            // No action taken apart from setting dirty flag, auto-save triggered as part of having a dirty asset
-            // and editor loosing focus instead.
-            #else
-            if (InputEditorUserSettings.autoSaveInputActionAssets)
-                Save(isAutoSave: false);
-            #endif
         }
 
         private void UpdateWindowTitle()
@@ -313,13 +305,7 @@ private bool HasContentChanged()
 
         private void DirtyInputActionsEditorWindow(InputActionsEditorState newState)
         {
-            #if UNITY_INPUT_SYSTEM_INPUT_ACTIONS_EDITOR_AUTO_SAVE_ON_FOCUS_LOST
-            // Window is dirty is equivalent to if asset has changed
             var isWindowDirty = HasContentChanged();
-            #else
-            // Window is dirty is never true since every change is auto-saved
-            var isWindowDirty = !InputEditorUserSettings.autoSaveInputActionAssets && HasContentChanged();
-            #endif
 
             if (m_IsDirty == isWindowDirty)
                 return;
@@ -345,16 +331,15 @@ private void OnFocus()
 
         private void OnLostFocus()
         {
-            // Auto-save triggers on focus-lost instead of on every change
-            #if UNITY_INPUT_SYSTEM_INPUT_ACTIONS_EDITOR_AUTO_SAVE_ON_FOCUS_LOST
             if (InputEditorUserSettings.autoSaveInputActionAssets && m_IsDirty)
+            {
                 // We'd like to avoid saving in case the focus was lost due to the drop-down window being spawned.
                 // This code should be cleaned up once we migrate the InputControl stuff from ImGUI completely.
                 // Since at that point it stops being a separate window that steals focus.
                 // (See case ISXB-1221)
                 if (!InputControlPathEditor.IsShowingDropdown)
                     Save(isAutoSave: true);
-            #endif
+            }
 
             analytics.RegisterEditorFocusOut();
         }

Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef

@@ -52,11 +52,6 @@
             "expression": "1.0.0",
             "define": "UNITY_INPUT_SYSTEM_ENABLE_UI"
         },
-        {
-            "name": "Unity",
-            "expression": "1",
-            "define": "UNITY_INPUT_SYSTEM_INPUT_ACTIONS_EDITOR_AUTO_SAVE_ON_FOCUS_LOST"
-        },
         {
             "name": "Unity",
             "expression": "6000.0.9",