Replace UpdateEditorState

This reverts something generated from an LLM which wasn't properly reviewed. And it fixes a regression preventing an application from receiving Input when using keyboard shortcut to enter play mode.

Author: jfreire-unity

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

@@ -115,19 +115,6 @@ private static void SendEditorAnalytic(InputAnalytics.IInputAnalytic analytic)
 
         #endregion
 
-        private static void UpdateEditorState()
-        {
-            if (InputRuntime.s_Instance is NativeInputRuntime nativeRuntime)
-            {
-                nativeRuntime.m_IsInPlayMode = EditorApplication.isPlaying;
-                nativeRuntime.m_IsEditorPaused = EditorApplication.isPaused;
-                nativeRuntime.m_IsEditorActive = InternalEditorUtility.isApplicationActive;
-            }
-
-            // Update Editor settings
-            InputSystem.s_Manager.m_AddDevicesNotSupportedByProject = InputEditorUserSettings.addDevicesNotSupportedByProject;
-        }
-
         private static void RegisterSetupApiUsage(int api)
         {
             InputExitPlayModeAnalytic.Register((InputExitPlayModeAnalytic.Api)api);
@@ -195,8 +182,6 @@ internal static void InitializeInEditor(bool calledFromCtor, IInputRuntime runti
 
                 EditorApplication.playModeStateChanged += OnEditorPlayModeStateChanged;
                 EditorApplication.projectChanged += OnEditorProjectChanged;
-                //TODO EDITOR CODE SPLIT: this doesn't make sense, needs to be removed
-                EditorApplication.update += UpdateEditorState;
 
                 InputSystem.s_Manager.runtime.onPlayModeChanged = InputSystem.OnPlayModeChange;
                 InputSystem.s_Manager.runtime.onProjectChange = InputSystem.OnProjectChange;
@@ -278,12 +263,9 @@ private static void InitializeEditorHooks()
             UnityEngine.InputSystem.UI.InputSystemUIInputModule.s_OnReset = OnUIInputModuleReset;
 #endif
 
-            // TODO EDITOR CODE SPLIT: check this is correct
-            UpdateEditorState();
-
             InputActionAsset.s_OnMarkAsDirty = DirtyAssetTracker.TrackDirtyInputActionAsset;
             InputManager.s_GetProjectWideActions = () => ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild;
-            InputSystem.s_Manager.m_AddDevicesNotSupportedByProject = InputEditorUserSettings.addDevicesNotSupportedByProject;
+            InputSystem.s_Manager.m_AddDevicesNotSupportedByProject = () => InputEditorUserSettings.addDevicesNotSupportedByProject;
 
             InputSystem.s_OnPlayModeChangeCallback = change => OnPlayModeChange((PlayModeStateChange)change);
             InputSystem.s_OnProjectChangeCallback = OnProjectChange;
@@ -300,6 +282,10 @@ private static void InitializeEditorHooks()
 
             if (InputRuntime.s_Instance is NativeInputRuntime nativeRuntime)
             {
+                nativeRuntime.m_IsInPlayMode = () => EditorApplication.isPlaying;
+                nativeRuntime.m_IsEditorPaused = () => EditorApplication.isPaused;
+                nativeRuntime.m_IsEditorActive = () => InternalEditorUtility.isApplicationActive;
+
                 nativeRuntime.m_RegisterWantsToQuit = RegisterWantsToQuit;
                 nativeRuntime.m_UnregisterWantsToQuit = UnregisterWantsToQuit;
 

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

@@ -1105,7 +1105,7 @@ private bool IsDeviceLayoutMarkedAsSupportedInSettings(InternedString layoutName
             // is useful to ensure that things like keyboard, mouse, and pen keep working in the editor
             // even if not supported as devices in the game.
             #if UNITY_EDITOR
-            if (m_AddDevicesNotSupportedByProject)
+            if (m_AddDevicesNotSupportedByProject?.Invoke() ?? false)
                 return true;
             #endif
 
@@ -2328,7 +2328,7 @@ internal struct AvailableDevice
         internal double m_EnterPlayModeTime;
 
         // Editor settings (set by InputSystemEditorInitializer)
-        internal bool m_AddDevicesNotSupportedByProject;
+        internal Func<bool> m_AddDevicesNotSupportedByProject;
 
         // Editor callback to get project-wide actions
         internal static Func<InputActionAsset> s_GetProjectWideActions;

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

@@ -335,14 +335,14 @@ public float scrollWheelDeltaPerTick
 
         #if UNITY_EDITOR
 
-        // These fields are set by InputSystemEditorInitializer to avoid direct Editor dependencies
-        internal bool m_IsInPlayMode;
-        internal bool m_IsEditorActive = true;
-        internal bool m_IsEditorPaused;
-
-        public bool isInPlayMode => m_IsInPlayMode;
-        public bool isEditorActive => m_IsEditorActive;
-        public bool isEditorPaused => m_IsEditorPaused;
+        // These delegates are set by InputSystemEditorInitializer to avoid direct Editor dependencies
+        internal Func<bool> m_IsInPlayMode;
+        internal Func<bool> m_IsEditorActive;
+        internal Func<bool> m_IsEditorPaused;
+
+        public bool isInPlayMode => m_IsInPlayMode?.Invoke() ?? false;
+        public bool isEditorActive => m_IsEditorActive?.Invoke() ?? true;
+        public bool isEditorPaused => m_IsEditorPaused?.Invoke() ?? false;
 
         // Unity Remote callbacks - set by Editor
         internal Action<Func<IntPtr, bool>> m_SetUnityRemoteMessageHandler;