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

restore the broken second completion when modifiers are not released after single variant insertion

Browse Source 
IDEA-58655 Ctrl+shift+space completion sometimes scrolls editor up
This commit is contained in:
peter.gromov
2010-11-19 20:59:41 +03:00
parent 8bade670b0
commit 39dd548f5d
3 changed files with 56 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+11 -14
View File
@@ -125,20 +125,17 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler {
final CompletionProgressIndicator indicator = CompletionServiceImpl.getCompletionService().getCurrentCompletion();
if (indicator != null) {
if (indicator.isRepeatedInvocation(myCompletionType, editor)) {
if (!indicator.isRunning() && (!isAutocompleteCommonPrefixOnInvocation() || indicator.fillInCommonPrefix(true))) {
return;
}
else {
time = indicator.getParameters().getInvocationCount() + 1;
new WriteCommandAction(project) {
protected void run(Result result) throws Throwable {
indicator.restorePrefix();
}
}.execute();
}
boolean repeated = indicator.isRepeatedInvocation(myCompletionType, editor);
if (repeated && !indicator.isRunning() && (!isAutocompleteCommonPrefixOnInvocation() || indicator.fillInCommonPrefix(true))) {
return;
}
if (repeated) {
time = indicator.getParameters().getInvocationCount() + 1;
indicator.restorePrefix();
} else {
indicator.closeAndFinish(false);
}
indicator.closeAndFinish(false);
}
if (time > 1) {
@@ -492,7 +489,7 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler {
handleSingleItem(offset2, indicator, items, item.getLookupString(), item);
// the insert handler may have started a live template with completion
if (CompletionService.getCompletionService() == null) {
if (CompletionService.getCompletionService().getCurrentCompletion() == null) {
indicator.liveAfterDeath(null);
}
}
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
+44 -20
View File
@@ -30,6 +30,7 @@ import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.SelectionModel;
import com.intellij.openapi.editor.event.*;
import com.intellij.openapi.editor.ex.DocumentEx;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.util.ProgressIndicatorBase;
@@ -91,10 +92,7 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
private boolean myModifiersReleased;
private String myOldDocumentText;
private int myOldCaret;
private int myOldStart;
private int myOldEnd;
private Runnable myRestorePrefix;
private boolean myBackgrounded;
private OffsetMap myOffsetMap;
private final CopyOnWriteArrayList<Pair<Integer, ElementPattern<String>>> myRestartingPrefixConditions = ContainerUtil.createEmptyCOWList();
@@ -295,7 +293,7 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
final int code = e.getKeyCode();
if (code == KeyEvent.VK_CONTROL || code == KeyEvent.VK_META || code == KeyEvent.VK_ALT || code == KeyEvent.VK_SHIFT) {
myModifiersReleased = true;
if (myOldDocumentText != null) {
if (myRestorePrefix != null) {
cleanup();
}
contentComponent.removeKeyListener(this);
@@ -305,7 +303,11 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
}
private void setMergeCommand() {
CommandProcessor.getInstance().setCurrentCommandGroupId("Completion" + hashCode());
CommandProcessor.getInstance().setCurrentCommandGroupId(getCompletionCommandName());
}
private String getCompletionCommandName() {
return "Completion" + hashCode();
}
public void showLookup() {
@@ -474,7 +476,7 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
private void cleanup() {
assert ApplicationManager.getApplication().isDispatchThread();
myHint = null;
myOldDocumentText = null;
myRestorePrefix = null;
unregisterItself();
}
@@ -578,17 +580,22 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
}
public void restorePrefix() {
setMergeCommand();
closeAndFinish(false);
if (myOldDocumentText != null) {
myEditor.getDocument().setText(myOldDocumentText);
myEditor.getSelectionModel().setSelection(myOldStart, myOldEnd);
myEditor.getCaretModel().moveToOffset(myOldCaret);
myOldDocumentText = null;
return;
}
new WriteCommandAction(getProject(), getCompletionCommandName()) {
@Override
protected void run(Result result) throws Throwable {
setMergeCommand();
if (myRestorePrefix != null) {
myRestorePrefix.run();
myRestorePrefix = null;
}
getLookup().restorePrefix();
}
}.execute();
getLookup().restorePrefix();
}
public Editor getEditor() {
@@ -600,10 +607,27 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
return;
}
myOldDocumentText = myEditor.getDocument().getText();
myOldCaret = myEditor.getCaretModel().getOffset();
myOldStart = myEditor.getSelectionModel().getSelectionStart();
myOldEnd = myEditor.getSelectionModel().getSelectionEnd();
final String documentText = myEditor.getDocument().getText();
final int caret = myEditor.getCaretModel().getOffset();
final int selStart = myEditor.getSelectionModel().getSelectionStart();
final int selEnd = myEditor.getSelectionModel().getSelectionEnd();
myRestorePrefix = new Runnable() {
@Override
public void run() {
DocumentEx document = (DocumentEx) myEditor.getDocument();
document.setInBulkUpdate(true);
try {
document.setText(documentText);
myEditor.getSelectionModel().setSelection(selStart, selEnd);
myEditor.getCaretModel().moveToOffset(caret);
}
finally {
document.setInBulkUpdate(false);
}
}
};
}
public boolean isRepeatedInvocation(CompletionType completionType, Editor editor) {
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+1 -6
View File
@@ -935,12 +935,7 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable {
public void restorePrefix() {
if (myInitialPrefix != null) {
performGuardedChange(new Runnable() {
@Override
public void run() {
myEditor.getDocument().replaceString(getLookupStart(), myEditor.getCaretModel().getOffset(), myInitialPrefix);
}
});
myEditor.getDocument().replaceString(getLookupStart(), myEditor.getCaretModel().getOffset(), myInitialPrefix);
}
}