From abe7d9363199bfa383d3befc7c3b174a442ff37a Mon Sep 17 00:00:00 2001
From: "Kirill.Safonov" <kirill.safonov@jetbrains.com>
Date: Thu, 30 Dec 2010 20:42:19 +0300
Subject: [PATCH] always try to use injected document when handling typing, so
 that autocompletion popup is invoked in right editor

---
 .../completion/CompletionAutoPopupTestCase.groovy   |  4 ++++
 .../codeInsight/editorActions/TypedHandler.java     | 13 -------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/java/testFramework/src/com/intellij/codeInsight/completion/CompletionAutoPopupTestCase.groovy b/java/testFramework/src/com/intellij/codeInsight/completion/CompletionAutoPopupTestCase.groovy
index 1fa17aeba53a..eec5c26704b2 100644
--- a/java/testFramework/src/com/intellij/codeInsight/completion/CompletionAutoPopupTestCase.groovy
+++ b/java/testFramework/src/com/intellij/codeInsight/completion/CompletionAutoPopupTestCase.groovy
@@ -55,6 +55,10 @@ abstract class CompletionAutoPopupTestCase extends LightCodeInsightFixtureTestCa
                                  })
   }
 
+  protected void doHighlighting() {
+    UIUtil.invokeAndWaitIfNeeded({ myFixture.doHighlighting() } as Runnable)
+  }
+
   void type(String s) {
     for (i in 0..<s.size()) {
       final c = s.charAt(i)
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java
index 3a805089df3a..233e06b81695 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java
@@ -246,19 +246,6 @@ public class TypedHandler implements TypedActionHandler {
   }
 
   static Editor injectedEditorIfCharTypedIsSignificant(final char charTyped, Editor editor, PsiFile oldFile) {
-    boolean significant = charTyped == '"' ||
-                          charTyped == '\'' ||
-                          charTyped == '[' ||
-                          charTyped == '(' ||
-                          charTyped == ']' ||
-                          charTyped == ')' ||
-                          charTyped == '{' ||
-                          charTyped == '}' ||
-                          charTyped == '.';
-    if (!significant) {
-      return editor;
-    }
-
     int offset = editor.getCaretModel().getOffset();
     // even for uncommitted document try to retrieve injected fragment that has been there recently
     // we are assuming here that when user is (even furiously) typing, injected language would not change