From 4160cdbc1578a9f4d0bfa8b308cf3cc5dd571ea7 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 21 Apr 2011 13:47:17 +0200
Subject: [PATCH] admit that the caret may move whenever it likes during
 completion

---
 .../CompletionProgressIndicator.java          | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 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 8eed9d88e02a..7c4d61ca0456 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
@@ -593,10 +593,6 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
   }
 
   public void addWatchedPrefix(int startOffset, ElementPattern<String> restartCondition) {
-    int caret = myEditor.getCaretModel().getOffset();
-    if (caret < startOffset) {
-      LOG.error("caret=" + caret + "; start=" + startOffset);
-    }
     myRestartingPrefixConditions.add(Pair.create(startOffset, restartCondition));
   }
 
@@ -605,14 +601,13 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
     final int caretOffset = myEditor.getCaretModel().getOffset();
     for (Pair<Integer, ElementPattern<String>> pair : myRestartingPrefixConditions) {
       int start = pair.first;
-      if (caretOffset < start) {
-        LOG.error("caret=" + caretOffset + "; start=" + start + "; phase=" + CompletionServiceImpl.getPhaseRaw() + "; running=" + isRunning() + "; canceled=" + isCanceled());
-      }
-      final String newPrefix = text.subSequence(start, caretOffset).toString();
-      if (pair.second.accepts(newPrefix)) {
-        scheduleRestart();
-        myRestartingPrefixConditions.clear();
-        return;
+      if (caretOffset >= start) {
+        final String newPrefix = text.subSequence(start, caretOffset).toString();
+        if (pair.second.accepts(newPrefix)) {
+          scheduleRestart();
+          myRestartingPrefixConditions.clear();
+          return;
+        }
       }
     }