From 00bbe88ac5b71c8185ce746bf5830bd5f217a244 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 14 Aug 2012 16:49:32 +0200 Subject: [PATCH] avoid SOE if lookup update on completion restart causes its listeners (implementation view) to run write actions (EA-35492) --- .../com/intellij/codeInsight/completion/CompletionPhase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionPhase.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionPhase.java index 6fb74673d6c0..b1ea4c254607 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionPhase.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionPhase.java @@ -155,7 +155,7 @@ public abstract class CompletionPhase implements Disposable { ApplicationManager.getApplication().addApplicationListener(new ApplicationAdapter() { @Override public void beforeWriteActionStart(Object action) { - if (!indicator.getLookup().isLookupDisposed()) { + if (!indicator.getLookup().isLookupDisposed() && !indicator.isCanceled()) { indicator.scheduleRestart(); } }