From ba1e36ad20d8804719e46bd7643076cd6f41508f Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 3 Mar 2011 15:57:24 +0100 Subject: [PATCH] the old-style autopopup to be triggered inside identifier --- .../intellij/codeInsight/completion/JavaAutoPopupTest.groovy | 2 +- .../codeInsight/editorActions/CompletionAutoPopupHandler.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy index f25b1f39443c..b51438cbe24e 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy @@ -125,7 +125,7 @@ class JavaAutoPopupTest extends CompletionAutoPopupTestCase { } - public void testNoAutopopupInTheMiddleOfIdentifier() { + public void _testNoAutopopupInTheMiddleOfIdentifier() { myFixture.configureByText("a.java", """ class Foo { String foo(String iterable) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java index 7f4b908fce85..a8dedbe9deb3 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java @@ -91,6 +91,7 @@ public class CompletionAutoPopupHandler extends TypedHandlerDelegate { } + /* if (!CompletionProgressIndicator.showHintAutopopup()) { final CharSequence text = editor.getDocument().getCharsSequence(); final int offset = editor.getSelectionModel().hasSelection() ? editor.getSelectionModel().getSelectionEnd() : editor.getCaretModel().getOffset(); @@ -98,6 +99,7 @@ public class CompletionAutoPopupHandler extends TypedHandlerDelegate { return Result.CONTINUE; } } + */ final boolean isMainEditor = FileEditorManager.getInstance(project).getSelectedTextEditor() == editor;