From 927bf3df9ff074507241e84397bb003b5f58e5ce Mon Sep 17 00:00:00 2001
From: Alexandr Suhinin <alexandr.suhinin@jetbrains.com>
Date: Mon, 13 Feb 2023 16:22:08 +0200
Subject: [PATCH] IDEA-310278: revert editor state when template is already
 finished

GitOrigin-RevId: 2d3935b949fa49a283c7ae4fa732417089a0eab7
---
 .../introduceParameter/InplaceIntroduceParameterPopup.java      | 2 +-
 .../com/intellij/refactoring/AbstractInplaceIntroduceTest.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java b/java/java-impl-refactorings/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
index d0dda3338a89..88669a7a558e 100644
--- a/java/java-impl-refactorings/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
+++ b/java/java-impl-refactorings/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
@@ -299,7 +299,7 @@ public final class InplaceIntroduceParameterPopup extends AbstractJavaInplaceInt
 
   @Override
   protected void performCleanup() {
-    myEditorState.revert();
+    ApplicationManager.getApplication().invokeLater(() -> myEditorState.revert());
   }
 
   @Override
diff --git a/platform/testFramework/src/com/intellij/refactoring/AbstractInplaceIntroduceTest.java b/platform/testFramework/src/com/intellij/refactoring/AbstractInplaceIntroduceTest.java
index 8ef7444a198f..9058044188b3 100644
--- a/platform/testFramework/src/com/intellij/refactoring/AbstractInplaceIntroduceTest.java
+++ b/platform/testFramework/src/com/intellij/refactoring/AbstractInplaceIntroduceTest.java
@@ -33,6 +33,7 @@ public abstract class AbstractInplaceIntroduceTest extends LightPlatformCodeInsi
       TemplateState state = TemplateManagerImpl.getTemplateState(getEditor());
       assert state != null;
       state.gotoEnd(true);
+      UIUtil.dispatchAllInvocationEvents();
       checkResultByFile(getBasePath() + name + "_after" + getExtension());
     }
     finally {