Add back UNITY_EDITOR guards to Editor code

jfreire-unity · jfreire-unity · commit 9c3e95188648 · 2026-04-02T16:34:30.000+03:00
There's no Editor assembly anymore so we need to make sure this code is not compiled when building players.
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Composites/AxisCompositeEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Composites/AxisCompositeEditor.cs
@@ -1,11 +1,11 @@
+#if UNITY_EDITOR
 using System;
 using UnityEditor;
 using UnityEngine.InputSystem.Editor;
 using UnityEngine.UIElements;
 
 namespace UnityEngine.InputSystem.Composites
 {
-    #if UNITY_EDITOR
     internal class AxisCompositeEditor : InputParameterEditor<AxisComposite>
     {
         private GUIContent m_WhichAxisWinsLabel = new GUIContent("Which Side Wins",
@@ -37,5 +37,5 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
             root.Add(modeField);
         }
     }
-    #endif
 }
+#endif
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Composites/Vector2CompositeEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Composites/Vector2CompositeEditor.cs
@@ -1,11 +1,11 @@
+#if UNITY_EDITOR
 using System;
 using UnityEditor;
 using UnityEngine.InputSystem.Editor;
 using UnityEngine.UIElements;
 
 namespace UnityEngine.InputSystem.Composites
 {
-    #if UNITY_EDITOR
     internal class Vector2CompositeEditor : InputParameterEditor<Vector2Composite>
     {
         private GUIContent m_ModeLabel = new GUIContent("Mode",
@@ -37,5 +37,5 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
             root.Add(modeField);
         }
     }
-    #endif
 }
+#endif
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Composites/Vector3CompositeEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Composites/Vector3CompositeEditor.cs
@@ -1,11 +1,11 @@
+#if UNITY_EDITOR
 using System;
 using UnityEditor;
 using UnityEngine.InputSystem.Editor;
 using UnityEngine.UIElements;
 
 namespace UnityEngine.InputSystem.Composites
 {
-    #if UNITY_EDITOR
     internal class Vector3CompositeEditor : InputParameterEditor<Vector3Composite>
     {
         private GUIContent m_ModeLabel = new GUIContent("Mode",
@@ -37,5 +37,5 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
             root.Add(modeField);
         }
     }
-    #endif
 }
+#endif
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/InputControlSchemeEditorExtensions.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/InputControlSchemeEditorExtensions.cs
@@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System.Collections.Generic;
 using UnityEditor;
 
@@ -35,3 +36,4 @@ public static InputControlScheme FromSerializedProperty(SerializedProperty sp)
         }
     }
 }
+#endif
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/HoldInteractionEditor.cs
@@ -1,11 +1,11 @@
+#if UNITY_EDITOR
 using System;
 using UnityEngine.InputSystem.Controls;
 using UnityEngine.InputSystem.Editor;
 using UnityEngine.UIElements;
 
 namespace UnityEngine.InputSystem.Interactions
 {
-    #if UNITY_EDITOR
     /// <summary>
     /// UI that is displayed when editing <see cref="HoldInteraction"/> in the editor.
     /// </summary>
@@ -43,5 +43,5 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
         private CustomOrDefaultSetting m_DurationSetting;
         private CustomOrDefaultSetting m_PressPointSetting;
     }
-    #endif
 }
+#endif
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/MultiTapInteractionEditor.cs
@@ -1,13 +1,13 @@
+#if UNITY_EDITOR
 using System;
 using UnityEditor;
 using UnityEngine.InputSystem.Editor;
 using UnityEngine.UIElements;
 
 namespace UnityEngine.InputSystem.Interactions
 {
-    #if UNITY_EDITOR
     /// <summary>
-    /// UI that is displayed when editing <see cref="HoldInteraction"/> in the editor.
+    /// UI that is displayed when editing <see cref="MultiTapInteraction"/> in the editor.
     /// </summary>
     internal class MultiTapInteractionEditor : InputParameterEditor<MultiTapInteraction>
     {
@@ -68,5 +68,5 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
         private CustomOrDefaultSetting m_TapTimeSetting;
         private CustomOrDefaultSetting m_TapDelaySetting;
     }
-    #endif
 }
+#endif
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/PressInteractionEditor.cs
@@ -1,11 +1,11 @@
+#if UNITY_EDITOR
 using System;
 using UnityEditor;
 using UnityEngine.InputSystem.Editor;
 using UnityEngine.UIElements;
 
 namespace UnityEngine.InputSystem.Interactions
 {
-    #if UNITY_EDITOR
     /// <summary>
     /// UI that is displayed when editing <see cref="PressInteraction"/> in the editor.
     /// </summary>
@@ -63,5 +63,5 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
             + "With ReleaseOnly, the action is performed on release. With PressAndRelease, the action is performed on press and "
             + "canceled on release.");
     }
-    #endif
 }
+#endif
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/SlowTapInteractionEditor.cs
@@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System;
 using UnityEngine.InputSystem.Editor;
 using UnityEngine.UIElements;
@@ -42,3 +43,4 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
         private CustomOrDefaultSetting m_PressPointSetting;
     }
 }
+#endif
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Actions/Interactions/TapInteractionEditor.cs
@@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System;
 using UnityEngine.InputSystem.Editor;
 using UnityEngine.UIElements;
@@ -42,3 +43,4 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
         private CustomOrDefaultSetting m_PressPointSetting;
     }
 }
+#endif
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Devices/Remote/RemoteInputPlayerConnectionEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Devices/Remote/RemoteInputPlayerConnectionEditor.cs
@@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using UnityEditor;
 
 namespace UnityEngine.InputSystem.Editor
@@ -24,3 +25,4 @@ public static RemoteInputPlayerConnection GetInstance()
         }
     }
 }
+#endif
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/InputSystemEditorInitializer.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/InputSystemEditorInitializer.cs
@@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System;
 using System.Collections.Generic;
 using Unity.Profiling;
@@ -598,3 +599,4 @@ private static void TestHook_EditorCleanup()
         #endregion
     }
 }
+#endif
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/HID/HIDSupportEditorInitializer.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/HID/HIDSupportEditorInitializer.cs
@@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.InputSystem.Editor;
@@ -31,3 +32,4 @@ private static void OnDeviceToolbarGUI(InputDevice device)
         }
     }
 }
+#endif
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/OnScreen/OnScreenButtonEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/OnScreen/OnScreenButtonEditor.cs
@@ -1,4 +1,4 @@
-#if PACKAGE_DOCS_GENERATION || UNITY_INPUT_SYSTEM_ENABLE_UI
+#if UNITY_EDITOR && (PACKAGE_DOCS_GENERATION || UNITY_INPUT_SYSTEM_ENABLE_UI)
 using UnityEditor;
 using UnityEditor.AnimatedValues;
 using UnityEngine.InputSystem.Editor;
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/OnScreen/OnScreenStickEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/OnScreen/OnScreenStickEditor.cs
@@ -1,4 +1,4 @@
-#if PACKAGE_DOCS_GENERATION || UNITY_INPUT_SYSTEM_ENABLE_UI
+#if UNITY_EDITOR && (PACKAGE_DOCS_GENERATION || UNITY_INPUT_SYSTEM_ENABLE_UI)
 using UnityEditor;
 using UnityEditor.AnimatedValues;
 using UnityEngine.InputSystem.Editor;
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/OnScreen/UGUIOnScreenControlEditorUtils.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/OnScreen/UGUIOnScreenControlEditorUtils.cs
@@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using UnityEditor;
 
 namespace UnityEngine.InputSystem.OnScreen
@@ -11,3 +12,4 @@ public static void ShowWarningIfNotPartOfCanvasHierarchy(OnScreenControl target)
         }
     }
 }
+#endif
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/iOS/InputSettingsiOSProvider.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Plugins/iOS/InputSettingsiOSProvider.cs
@@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System;
 using UnityEditor;
 
@@ -30,3 +31,4 @@ public void OnGUI()
         }
     }
 }
+#endif
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs
@@ -1,10 +1,10 @@
+#if UNITY_EDITOR
 using System;
 using System.Collections.Generic;
 using UnityEngine.InputSystem.LowLevel;
 using UnityEditor;
 using UnityEngine.UIElements;
 
-#if UNITY_EDITOR
 namespace UnityEngine.InputSystem.Editor
 {
     /// <summary>
@@ -106,4 +106,4 @@ private int GetEnumIndex(int enumValue)
         private string[] m_EnumDisplayNames;
     }
 }
- #endif // UNITY_EDITOR
+#endif

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
	`1`	`+#if UNITY_EDITOR`
`1`	`2`	`using System;`
`2`	`3`	`using UnityEditor;`
`3`	`4`	`using UnityEngine.InputSystem.Editor;`
`4`	`5`	`using UnityEngine.UIElements;`
`5`	`6`
`6`	`7`	`namespace UnityEngine.InputSystem.Composites`
`7`	`8`	`{`
`8`		`- #if UNITY_EDITOR`
`9`	`9`	`internal class AxisCompositeEditor : InputParameterEditor<AxisComposite>`
`10`	`10`	`{`
`11`	`11`	`private GUIContent m_WhichAxisWinsLabel = new GUIContent("Which Side Wins",`
`@@ -37,5 +37,5 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa`
`37`	`37`	`root.Add(modeField);`
`38`	`38`	`}`
`39`	`39`	`}`
`40`		`- #endif`
`41`	`40`	`}`
	`41`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#if UNITY_EDITOR`
`1`	`2`	`using System.Collections.Generic;`
`2`	`3`	`using UnityEditor;`
`3`	`4`
`@@ -35,3 +36,4 @@ public static InputControlScheme FromSerializedProperty(SerializedProperty sp)`
`35`	`36`	`}`
`36`	`37`	`}`
`37`	`38`	`}`
	`39`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
	`1`	`+#if UNITY_EDITOR`
`1`	`2`	`using System;`
`2`	`3`	`using UnityEditor;`
`3`	`4`	`using UnityEngine.InputSystem.Editor;`
`4`	`5`	`using UnityEngine.UIElements;`
`5`	`6`
`6`	`7`	`namespace UnityEngine.InputSystem.Interactions`
`7`	`8`	`{`
`8`		`- #if UNITY_EDITOR`
`9`	`9`	`/// <summary>`
`10`		`- /// UI that is displayed when editing <see cref="HoldInteraction"/> in the editor.`
	`10`	`+ /// UI that is displayed when editing <see cref="MultiTapInteraction"/> in the editor.`
`11`	`11`	`/// </summary>`
`12`	`12`	`internal class MultiTapInteractionEditor : InputParameterEditor<MultiTapInteraction>`
`13`	`13`	`{`
`@@ -68,5 +68,5 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa`
`68`	`68`	`private CustomOrDefaultSetting m_TapTimeSetting;`
`69`	`69`	`private CustomOrDefaultSetting m_TapDelaySetting;`
`70`	`70`	`}`
`71`		`- #endif`
`72`	`71`	`}`
	`72`	`+#endif`