From f3a8897763d23129e4c3c88454ca0f2bccfdb50e Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 7 Apr 2016 16:17:09 +0200 Subject: [PATCH] another place in parameter info to use async commit --- .../codeInsight/AutoPopupController.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java b/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java index becf68bef55a..97c95f00a54c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java @@ -36,7 +36,6 @@ import com.intellij.openapi.application.TransactionId; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.DumbService; -import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Key; @@ -178,22 +177,14 @@ public class AutoPopupController implements Disposable { } final PsiFile file1 = file; - final Runnable request = new Runnable(){ - @Override - public void run(){ - if (myProject.isDisposed() || DumbService.isDumb(myProject)) return; - documentManager.commitAllDocuments(); - if (editor.isDisposed() || !editor.getComponent().isShowing()) return; + Runnable request = () -> { + if (!myProject.isDisposed() && !DumbService.isDumb(myProject) && !editor.isDisposed() && editor.getComponent().isShowing()) { int lbraceOffset = editor.getCaretModel().getOffset() - 1; - try { - ShowParameterInfoHandler.invoke(myProject, editor, file1, lbraceOffset, highlightedMethod, false); - } - catch (IndexNotReadyException ignored) { //anything can happen on alarm - } + ShowParameterInfoHandler.invoke(myProject, editor, file1, lbraceOffset, highlightedMethod, false); } }; - addRequest(request, settings.PARAMETER_INFO_DELAY); + addRequest(() -> documentManager.performLaterWhenAllCommitted(request), settings.PARAMETER_INFO_DELAY); } }