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

tolerate lookup being closed by 3d parties during finishLookup (EA-33434,EA-32899)

Browse Source
This commit is contained in:
peter
2012-02-02 19:03:14 +01:00
parent d4a1214f78
commit 07666225ec
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+23 -14
View File
@@ -137,6 +137,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
private boolean myStartCompletionWhenNothingMatches;
private boolean myResizePending;
private int myMaximumHeight = Integer.MAX_VALUE;
private boolean myFinishing;
public LookupImpl(Project project, Editor editor, @NotNull LookupArranger arranger){
super(new JPanel(new BorderLayout()));
@@ -714,6 +715,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
}
public void finishLookup(char completionChar, @Nullable final LookupElement item) {
//noinspection deprecation,unchecked
if (item == null ||
item instanceof EmptyLookupItem ||
item.getObject() instanceof DeferredUserLookupValue &&
@@ -724,6 +726,10 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
return;
}
if (myDisposed) { // DeferredUserLookupValue could close us in any way
return;
}
final PsiFile file = getPsiFile();
if (file != null && !WriteCommandAction.ensureFilesWritable(myProject, Arrays.asList(file))) {
doHide(false, true);
@@ -731,6 +737,10 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
return;
}
if (myDisposed) { // ensureFilesWritable could close us by showing a dialog
return;
}
final String prefix = itemPattern(item);
boolean plainMatch = ContainerUtil.or(item.getAllLookupStrings(), new Condition<String>() {
@Override
@@ -742,17 +752,16 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
FeatureUsageTracker.getInstance().triggerFeatureUsed(CodeCompletionFeatures.EDITING_COMPLETION_CAMEL_HUMPS);
}
if (!performGuardedChange(new Runnable() {
public void run() {
AccessToken token = WriteAction.start();
try {
insertLookupString(item, prefix);
}
finally {
token.finish();
}
}
})) {
myFinishing = true;
AccessToken token = WriteAction.start();
try {
insertLookupString(item, prefix);
}
finally {
token.finish();
}
if (myDisposed) { // any document listeners could close us
return;
}
@@ -929,7 +938,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
private void addListeners() {
myEditor.getDocument().addDocumentListener(new DocumentAdapter() {
public void documentChanged(DocumentEvent e) {
if (!myChangeGuard) {
if (!myChangeGuard && !myFinishing) {
hide();
}
}
@@ -937,14 +946,14 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
final CaretListener caretListener = new CaretListener() {
public void caretPositionChanged(CaretEvent e) {
if (!myChangeGuard) {
if (!myChangeGuard && !myFinishing) {
hide();
}
}
};
final SelectionListener selectionListener = new SelectionListener() {
public void selectionChanged(final SelectionEvent e) {
if (!myChangeGuard) {
if (!myChangeGuard && !myFinishing) {
hide();
}
}