FIX: Only allow a single Paste after Cutting an item (ISX-1821) (#1838)

* FIX: Only allow a single Paste after Cutting an item (ISX-1821)

* Address feedback

Author: graham-huws

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -40,6 +40,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed console errors that can be produced when opening input package settings from the Inspector.
 - Fixed InputManager.asset file growing in size on each Reset call.
 - Fixed Opening InputDebugger throws 'Action map must have state at this point' error
+- Fixed Cut/Paste behaviour to match Editor - Cut items will now be cleared from clipboard after pasting.
 
 ## [1.8.0-pre.2] - 2023-11-09
 

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

@@ -110,7 +110,7 @@ public static Command CutActionMapSelection()
         {
             return (in InputActionsEditorState state) =>
             {
-                CopyPasteHelper.CopyActionMap(state);
+                CopyPasteHelper.CutActionMap(state);
                 return DeleteActionMap(state.selectedActionMapIndex).Invoke(state);
             };
         }
@@ -128,7 +128,7 @@ public static Command CutActionsOrBindings()
         {
             return (in InputActionsEditorState state) =>
             {
-                CopyPasteHelper.Copy(state);
+                CopyPasteHelper.Cut(state);
                 return state.selectionType == SelectionType.Action ?
                     DeleteAction(state.selectedActionMapIndex, Selectors.GetSelectedAction(state)?.wrappedProperty.FindPropertyRelative(nameof(InputAction.m_Name)).stringValue).Invoke(state)
                     : DeleteBinding(state.selectedActionMapIndex, state.selectedBindingIndex).Invoke(state);

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs

@@ -22,11 +22,28 @@ internal static class CopyPasteHelper
 
         private static SerializedProperty s_lastAddedElement;
         private static InputActionsEditorState s_State;
+        private static bool s_lastClipboardActionWasCut = false;
 
         private static bool IsComposite(SerializedProperty property) => property.FindPropertyRelative("m_Flags").intValue == (int)InputBinding.Flags.Composite;
         private static bool IsPartOfComposite(SerializedProperty property) => property.FindPropertyRelative("m_Flags").intValue == (int)InputBinding.Flags.PartOfComposite;
         private static string PropertyName(SerializedProperty property) => property.FindPropertyRelative("m_Name").stringValue;
 
+        #region Cut
+
+        public static void CutActionMap(InputActionsEditorState state)
+        {
+            CopyActionMap(state);
+            s_lastClipboardActionWasCut = true;
+        }
+
+        public static void Cut(InputActionsEditorState state)
+        {
+            Copy(state);
+            s_lastClipboardActionWasCut = true;
+        }
+
+        #endregion
+
         #region Copy
 
         public static void CopyActionMap(InputActionsEditorState state)
@@ -54,6 +71,7 @@ private static void CopySelectedTreeViewItemsToClipboard(List<SerializedProperty
             var copyBuffer = new StringBuilder();
             CopyItems(items, copyBuffer, type, actionMap);
             EditorGUIUtility.systemCopyBuffer = copyBuffer.ToString();
+            s_lastClipboardActionWasCut = false;
         }
 
         private static void CopyItems(List<SerializedProperty> items, StringBuilder buffer, Type type, SerializedProperty actionMap)
@@ -152,6 +170,11 @@ public static SerializedProperty PasteActionMapsFromClipboard(InputActionsEditor
             s_State = state;
             var actionMapArray = state.serializedObject.FindProperty(nameof(InputActionAsset.m_ActionMaps));
             PasteData(EditorGUIUtility.systemCopyBuffer, new[] {state.selectedActionMapIndex}, actionMapArray);
+
+            // Don't want to be able to paste repeatedly after a cut - ISX-1821
+            if (s_lastAddedElement != null && s_lastClipboardActionWasCut)
+                EditorGUIUtility.systemCopyBuffer = string.Empty;
+
             return s_lastAddedElement;
         }
 
@@ -164,6 +187,11 @@ public static SerializedProperty PasteActionsOrBindingsFromClipboard(InputAction
                 PasteActionsFromClipboard(state, addLast);
             if (typeOfCopiedData == typeof(InputBinding))
                 PasteBindingsFromClipboard(state);
+
+            // Don't want to be able to paste repeatedly after a cut - ISX-1821
+            if (s_lastAddedElement != null && s_lastClipboardActionWasCut)
+                EditorGUIUtility.systemCopyBuffer = string.Empty;
+
             return s_lastAddedElement;
         }