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 hang after exceptions in completion thread (IDEA-90638)

Browse Source
This commit is contained in:
peter
2012-09-05 11:26:03 +02:00
parent 48c4b12c14
commit 88d1f66b6d
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
+23 -10
View File
@@ -41,6 +41,7 @@ import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.util.ProgressIndicatorBase;
import com.intellij.openapi.progress.util.ProgressWrapper;
@@ -725,22 +726,34 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
class CalculateItems implements Runnable {
@Override
public void run() {
duringCompletion(initContext);
ProgressManager.checkCanceled();
LookupElement[] result = CompletionService.getCompletionService().performCompletion(myParameters, weigher);
ProgressManager.checkCanceled();
weigher.waitFor();
ProgressManager.checkCanceled();
data.set(result);
try {
data.set(calculateItems(initContext, weigher));
}
catch (ProcessCanceledException ignore) {
}
catch (Throwable t) {
LOG.error(t);
cancel();
}
}
}
strategy.startThread(this, new CalculateItems());
return data;
}
private LookupElement[] calculateItems(CompletionInitializationContext initContext, WeighingDelegate weigher) {
duringCompletion(initContext);
ProgressManager.checkCanceled();
LookupElement[] result = CompletionService.getCompletionService().performCompletion(myParameters, weigher);
ProgressManager.checkCanceled();
weigher.waitFor();
ProgressManager.checkCanceled();
return result;
}
private static class ModifierTracker extends KeyAdapter {
private final JComponent myContentComponent;