From bb9812222514f2920f7659ee022fedbbef4e99bb Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 29 Oct 2016 12:35:28 +0200 Subject: [PATCH] handle MethodOrClosureScopeChooser selection in a write-safe context (EA-90852 - assert: PsiModificationTrackerImpl.fireEvent) --- .../groovy/refactoring/ui/MethodOrClosureScopeChooser.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/MethodOrClosureScopeChooser.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/MethodOrClosureScopeChooser.java index c977bbe66d61..5a1bfa1fd363 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/MethodOrClosureScopeChooser.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/MethodOrClosureScopeChooser.java @@ -15,6 +15,7 @@ */ package org.jetbrains.plugins.groovy.refactoring.ui; +import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.colors.EditorColors; @@ -151,7 +152,7 @@ public class MethodOrClosureScopeChooser { else { toSearchFor = superMethod.isEnabled() && superMethod.isSelected() ? ToSearchIn.getParent() : null; } - IdeFocusManager.findInstance().doWhenFocusSettlesDown(() -> callback.fun(ToSearchIn, toSearchFor)); + IdeFocusManager.findInstance().doWhenFocusSettlesDown(() -> callback.fun(ToSearchIn, toSearchFor), ModalityState.current()); } }, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0))); -- 2.32.0