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

correct backspace and completion preview interaction

Browse Source
This commit is contained in:
peter
2012-12-27 11:45:17 +01:00
parent 43746d0483
commit 297b17c365
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/CompletionPreview.java
+6 -7
View File
@@ -39,12 +39,12 @@ public class CompletionPreview {
private final LookupImpl myLookup;
private Disposable myUninstaller;
private CompletionPreview(LookupImpl lookup, final String text, final String prefix) {
private CompletionPreview(LookupImpl lookup, final String text, final int prefixLength) {
myLookup = lookup;
final Editor editor = myLookup.getEditor();
final int caret = editor.getCaretModel().getOffset();
int previewStart = caret - prefix.length();
int previewStart = caret - prefixLength;
final int previewEnd = previewStart + text.length();
myLookup.performGuardedChange(new Runnable() {
@@ -54,7 +54,7 @@ public class CompletionPreview {
public void run() {
AccessToken token = WriteAction.start();
try {
editor.getDocument().insertString(caret, text.substring(prefix.length()));
editor.getDocument().insertString(caret, text.substring(prefixLength));
}
finally {
token.finish();
@@ -131,12 +131,11 @@ public class CompletionPreview {
}
}
String prefix = lookup.itemPattern(item);
if (prefix.length() > text.length()) {
int prefixLength = lookup.getPrefixLength(item);
if (prefixLength > text.length()) {
return;
}
new CompletionPreview(lookup, text, prefix);
new CompletionPreview(lookup, text, prefixLength);
}
public void uninstallPreview() {
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+5 -1
View File
@@ -623,7 +623,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
myFinishing = true;
AccessToken token = WriteAction.start();
try {
insertLookupString(item, myOffsets.getPrefixLength(item, this));
insertLookupString(item, getPrefixLength(item));
}
finally {
token.finish();
@@ -638,6 +638,10 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
fireItemSelected(item, completionChar);
}
public int getPrefixLength(LookupElement item) {
return myOffsets.getPrefixLength(item, this);
}
private void insertLookupString(LookupElement item, final int prefix) {
Document document = myEditor.getDocument();