From 60fa02426b02540b5dff22804f88e1bb6ed5eaac Mon Sep 17 00:00:00 2001 From: Alexander Trushev Date: Tue, 17 Jun 2025 21:04:36 +0200 Subject: [PATCH] [rd-editor] IJPL-192250 Do not use focus-based document reference to form undo/redo stacks GitOrigin-RevId: 4c2c8d84b09f72d1fb319b33bae9f2994d085740 --- .../src/com/intellij/openapi/command/impl/UndoClientState.java | 1 + .../src/com/intellij/openapi/command/impl/UndoManagerImpl.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoClientState.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoClientState.java index a4fccafd9211..0dc91047e8ef 100644 --- a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoClientState.java +++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoClientState.java @@ -184,6 +184,7 @@ final class UndoClientState implements Disposable { currentProject = commandProject; } if (project != null && project == commandProject && recordOriginalReference) { + // note: originatorReference depends on FocusedComponent :sad_trombone_for_rd:, see IJPL-192250 originatorReference = UndoDocumentUtil.getDocReference(project, editorProvider); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java index 06cb887c7d69..481582e2a7cb 100644 --- a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java @@ -346,7 +346,8 @@ public class UndoManagerImpl extends UndoManager { mySharedUndoStacksHolder.trimStacks(Collections.singleton(docRef)); } - void onCommandStarted( + @ApiStatus.Internal + protected void onCommandStarted( @Nullable Project project, @NotNull UndoConfirmationPolicy undoConfirmationPolicy, boolean recordOriginalReference