MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

don't bother tracking modifiers if there weren't any

Browse Source
This commit is contained in:
peter
2011-02-28 18:29:29 +01:00
parent eb421d5faa
commit 1ab20cc964
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+1 -1
View File
@@ -248,7 +248,7 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler {
final Semaphore freezeSemaphore = new Semaphore();
freezeSemaphore.down();
final CompletionProgressIndicator indicator = new CompletionProgressIndicator(editor, parameters, this, freezeSemaphore,
initContext.getOffsetMap(), lookup);
initContext.getOffsetMap(), lookup, hasModifiers);
boolean sync =
(invokedExplicitly || ApplicationManager.getApplication().isUnitTestMode()) && !CompletionAutoPopupHandler.ourTestingAutopopup;
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
+10 -6
View File
@@ -105,7 +105,7 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
private volatile int myCount;
public CompletionProgressIndicator(final Editor editor, CompletionParameters parameters, CodeCompletionHandlerBase handler, Semaphore freezeSemaphore,
final OffsetMap offsetMap, LookupImpl lookup) {
final OffsetMap offsetMap, LookupImpl lookup, boolean hasModifiers) {
myEditor = editor;
myParameters = parameters;
myHandler = handler;
@@ -123,11 +123,17 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
ApplicationManager.getApplication().assertIsDispatchThread();
registerItself();
if (!ApplicationManager.getApplication().isUnitTestMode() && !lookup.isShown()) {
if (ApplicationManager.getApplication().isUnitTestMode()) {
return;
}
if (!lookup.isShown()) {
scheduleAdvertising();
}
trackModifiers();
if (hasModifiers) {
trackModifiers();
}
}
public OffsetMap getOffsetMap() {
@@ -251,9 +257,7 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
}
private void trackModifiers() {
if (isAutopopupCompletion()) {
return;
}
assert !isAutopopupCompletion();
final JComponent contentComponent = myEditor.getContentComponent();
contentComponent.addKeyListener(new KeyAdapter() {