From d88aee51a4ab5dfb6e2e2ae90344be5ebdb5cca2 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 14 Aug 2012 15:38:35 +0200
Subject: [PATCH] don't restart already restarted completion (EA-37973)

---
 .../completion/CompletionProgressIndicator.java            | 4 +++-
 .../intellij/codeInsight/lookup/impl/BackspaceHandler.java | 7 ++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
index c6267253f16e..f6ca2e6edd5b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
@@ -604,7 +604,9 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
     cancel();
 
     final CompletionProgressIndicator current = CompletionServiceImpl.getCompletionService().getCurrentCompletion();
-    LOG.assertTrue(this == current, current + "!=" + this);
+    if (this != current) {
+      LOG.error(current + "!=" + this);
+    }
 
     if (isAutopopupCompletion() && !myLookup.isShown()) {
       if (CompletionServiceImpl.getCompletionService().getCurrentCompletion() == this) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/BackspaceHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/BackspaceHandler.java
index 3b07eaa3143e..17b9eba96e89 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/BackspaceHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/BackspaceHandler.java
@@ -62,14 +62,11 @@ public class BackspaceHandler extends EditorActionHandler {
     }
 
     if (process != null) {
-      process.prefixUpdated();
-    }
-
-    if (hideOffset < editor.getCaretModel().getOffset()) {
-      if (process != null) {
+      if (hideOffset < editor.getCaretModel().getOffset()) {
         process.scheduleRestart();
         return;
       }
+      process.prefixUpdated();
     }
 
     lookup.hide();