From 740354f00a0c70fc57930d97478cf3228623a123 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 12 Apr 2011 10:44:35 +0200 Subject: [PATCH] some phase changing is allowed --- .../codeInsight/completion/impl/CompletionServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java index 99ab043d93f4..7cba8937de37 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java @@ -243,7 +243,7 @@ public class CompletionServiceImpl extends CompletionService{ ApplicationManager.getApplication().assertIsDispatchThread(); CompletionPhase oldPhase = getCompletionPhase(); CompletionProgressIndicator oldIndicator = oldPhase.indicator; - if (oldIndicator != null) { + if (oldIndicator != null && !(phase instanceof CompletionPhase.BgCalculation)) { LOG.assertTrue(!oldIndicator.isRunning() || oldIndicator.isCanceled(), "don't change phase during running completion"); }