Make InputEditorUserSettings work again and deal

Author: jfreire-unity

Packages/com.unity.inputsystem/Editor/InputSystemEditorInitializer.cs

@@ -209,7 +209,7 @@ internal static void InitializeInEditor(bool calledFromCtor, IInputRuntime runti
                     InputSystem.s_Manager.m_SavedDeviceStates = s_StateManager.systemState.managerState.devices;
                     InputSystem.s_Manager.m_SavedAvailableDevices = s_StateManager.systemState.managerState.availableDevices;
 
-                    // InputEditorUserSettings.s_Settings = s_StateManager.systemState.userSettings;
+                    InputEditorUserSettings.s_Settings = s_StateManager.systemState.userSettings;
 
                     s_StateManager.systemState = new InputSystemState();
                 }
@@ -233,10 +233,8 @@ internal static void InitializeInEditor(bool calledFromCtor, IInputRuntime runti
                 SetUpEditorRemoting();
             }
 
-            //TODO EDITOR CODE SPLIT: fix this
-            // Debug.Assert(settings != null);
-            // Debug.Assert(HasNativeObject(settings), "InputSettings has lost its native object");
-
+            Debug.Assert(InputSystem.settings != null);
+            Debug.Assert(HasNativeObject(InputSystem.settings), "InputSettings has lost its native object");
 
             UnityRemoteSupport.Initialize();
 

Packages/com.unity.inputsystem/Editor/InputSystemStateManager.cs

@@ -70,8 +70,7 @@ public void OnBeforeSerialize()
             }
 
             systemState.remoteConnection = InputSystem.remoteConnection;
-            //TODO: fix
-            // systemState.userSettings = InputEditorUserSettings.s_Settings;
+            systemState.userSettings = InputEditorUserSettings.s_Settings;
         }
 
         public void OnAfterDeserialize()

…itor/Settings/InputEditorUserSettings.cs …ystem/Runtime/InputEditorUserSettings.csPackages/com.unity.inputsystem/Editor/Settings/InputEditorUserSettings.cs renamed to Packages/com.unity.inputsystem/Runtime/InputEditorUserSettings.cs Packages/com.unity.inputsystem/Editor/Settings/InputEditorUserSettings.cs renamed to Packages/com.unity.inputsystem/Runtime/InputEditorUserSettings.cs

@@ -4,14 +4,16 @@
 
 ////TODO: event diagnostics should have a bool here
 
-namespace UnityEngine.InputSystem.Editor
+namespace UnityEngine.InputSystem
 {
     /// <summary>
     /// Settings that are local to the current user and specific to the input system's use in the editor.
     /// </summary>
     /// <remarks>
     /// These settings are not stored in assets in the project along with the other input settings.
     /// Instead, they are serialized to JSON and stored in the project's Library/ folder.
+    ///
+    /// They are currently part of the Runtime code because they don't have any particular Editor dependency.
     /// </remarks>
     internal static class InputEditorUserSettings
     {

…Settings/InputEditorUserSettings.cs.meta …/Runtime/InputEditorUserSettings.cs.metaPackages/com.unity.inputsystem/Editor/Settings/InputEditorUserSettings.cs.meta renamed to Packages/com.unity.inputsystem/Runtime/InputEditorUserSettings.cs.meta Packages/com.unity.inputsystem/Editor/Settings/InputEditorUserSettings.cs.meta renamed to Packages/com.unity.inputsystem/Runtime/InputEditorUserSettings.cs.meta

@@ -3369,8 +3369,6 @@ public static bool runInBackground
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
         private static RemoteInputPlayerConnection s_RemoteConnection;
 
-        //TODO decide if we want to have a setter
-        // This was a quick fix necessary after FEPM
         internal static RemoteInputPlayerConnection remoteConnection
         {
             get => s_RemoteConnection;

Packages/com.unity.inputsystem/Runtime/InputSystem.cs

@@ -21,7 +21,7 @@ internal struct InputSystemState
         [SerializeField] public InputManager.SerializedState managerState;
         [SerializeField] public InputRemoting.SerializedState remotingState;
 #if UNITY_EDITOR
-        // [SerializeField] public InputEditorUserSettings.SerializedState userSettings;
+        [SerializeField] public InputEditorUserSettings.SerializedState userSettings;
         [SerializeField] public string systemObject;
 #endif
         ////TODO: make these saved states capable of surviving domain reloads