Moving more things around that have a direct or indirect dependency on UIElements

Create a mechanism for the Editor to be able to register hooks in the runtime assembly.

Author: LeoUnity

Assets/Tests/InputSystem.Editor/ControlSchemeEditorTests.cs

@@ -43,7 +43,7 @@ public void RemoveRequirementCommand_RemovesDeviceRequirements()
         var state = TestData.editorState.Generate().With(selectedControlScheme: controlScheme);
 
 
-        var newState = ControlSchemeCommands.RemoveDeviceRequirement(0)(in state);
+        var newState = UnityEngine.InputSystem.Editor.ControlSchemeCommands.RemoveDeviceRequirement(0)(in state);
 
 
         Assert.That(newState.selectedControlScheme.deviceRequirements.Count, Is.EqualTo(1));

Assets/Tests/InputSystem/CoreTests_Editor.cs

@@ -23,6 +23,7 @@
 using UnityEngine.InputSystem.Users;
 using UnityEngine.InputSystem.Utilities;
 using UnityEngine.TestTools;
+using UnityEditor.InputSystem.Interactions;
 
 #pragma warning disable CS0649
 partial class CoreTests

Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef

@@ -3,6 +3,7 @@
     "rootNamespace": "",
     "references": [
         "Unity.InputSystem",
+        "Unity.InputSystem.Editor",
         "Unity.InputSystem.TestFramework",
         "Unity.ugui",
         "Unity.PackageManagerDocTools.Editor",

Packages/com.unity.inputsystem/Editor/Actions/AxisCompositeEditor.cs

@@ -20,7 +20,7 @@ internal class AxisCompositeEditor : InputParameterEditor<AxisComposite>
         public override void OnGUI()
         {
 #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
-            if (!InputSystem.settings.useIMGUIEditorForAssets) return;
+            if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return;
 #endif
             target.whichSideWins = (AxisComposite.WhichSideWins)EditorGUILayout.EnumPopup(m_WhichAxisWinsLabel, target.whichSideWins);
         }

Packages/com.unity.inputsystem/Editor/Actions/Interactions/HoldInteractionEditor.cs

@@ -1,4 +1,5 @@
 
+using System;
 using UnityEngine.InputSystem.Controls;
 using UnityEngine.InputSystem.Interactions;
 #if UNITY_EDITOR
@@ -29,7 +30,7 @@ protected override void OnEnable()
         public override void OnGUI()
         {
 #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
-            if (!InputSystem.settings.useIMGUIEditorForAssets) return;
+            if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return;
 #endif
             m_PressPointSetting.OnGUI();
             m_DurationSetting.OnGUI();

Packages/com.unity.inputsystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs

@@ -1,4 +1,5 @@
 
+using System;
 using UnityEngine;
 using UnityEngine.InputSystem.Interactions;
 #if UNITY_EDITOR
@@ -38,7 +39,7 @@ protected override void OnEnable()
         public override void OnGUI()
         {
 #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
-            if (!InputSystem.settings.useIMGUIEditorForAssets) return;
+            if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return;
 #endif
             target.tapCount = EditorGUILayout.IntField(m_TapCountLabel, target.tapCount);
             m_TapDelaySetting.OnGUI();

Packages/com.unity.inputsystem/Editor/Actions/Interactions/PressInteractionEditor.cs

@@ -1,4 +1,5 @@
 
+using System;
 using UnityEngine;
 using UnityEngine.InputSystem.Interactions;
 #if UNITY_EDITOR
@@ -30,7 +31,7 @@ protected override void OnEnable()
         public override void OnGUI()
         {
 #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
-            if (!InputSystem.settings.useIMGUIEditorForAssets) return;
+            if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return;
 #endif
             EditorGUILayout.HelpBox(s_HelpBoxText);
             target.behavior = (PressBehavior)EditorGUILayout.EnumPopup(s_PressBehaviorLabel, target.behavior);

Packages/com.unity.inputsystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs

@@ -1,4 +1,5 @@
 
+using System;
 using UnityEngine.InputSystem.Interactions;
 #if UNITY_EDITOR
 using UnityEngine.InputSystem.Editor;
@@ -27,7 +28,7 @@ protected override void OnEnable()
         public override void OnGUI()
         {
 #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
-            if (!InputSystem.settings.useIMGUIEditorForAssets) return;
+            if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return;
 #endif
             m_DurationSetting.OnGUI();
             m_PressPointSetting.OnGUI();

Packages/com.unity.inputsystem/Editor/Actions/Interactions/TapInteractionEditor.cs

@@ -1,4 +1,5 @@
 
+using System;
 using UnityEngine.InputSystem.Interactions;
 #if UNITY_EDITOR
 using UnityEngine.InputSystem.Editor;
@@ -27,7 +28,7 @@ protected override void OnEnable()
         public override void OnGUI()
         {
 #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
-            if (!InputSystem.settings.useIMGUIEditorForAssets) return;
+            if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return;
 #endif
             m_DurationSetting.OnGUI();
             m_PressPointSetting.OnGUI();

Packages/com.unity.inputsystem/Editor/Actions/Vector2CompositeEditor.cs

@@ -1,4 +1,5 @@
 
+using System;
 using UnityEngine;
 using UnityEngine.InputSystem.Composites;
 #if UNITY_EDITOR
@@ -19,7 +20,7 @@ internal class Vector2CompositeEditor : InputParameterEditor<Vector2Composite>
         public override void OnGUI()
         {
 #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
-            if (!InputSystem.settings.useIMGUIEditorForAssets) return;
+            if (!UnityEngine.InputSystem.InputSystem.settings.useIMGUIEditorForAssets) return;
 #endif
             target.mode = (Vector2Composite.Mode)EditorGUILayout.EnumPopup(m_ModeLabel, target.mode);
         }