From 2c8763845bd111631075836edb956569761534ba Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Fri, 12 Aug 2011 14:42:03 +0400 Subject: [PATCH] Make sure we won't run daemon passes if there's lookup shown --- .../daemon/impl/DaemonCodeAnalyzerImpl.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java index 67c4e4e7080d..9e8f001d6b98 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java @@ -706,18 +706,19 @@ public class DaemonCodeAnalyzerImpl extends DaemonCodeAnalyzer implements JDOMEx private Runnable createUpdateRunnable() { return new Runnable() { public void run() { - PassExecutorService.log(myUpdateProgress, null, "Update Runnable. myUpdateByTimerEnabled:",myUpdateByTimerEnabled," something disposed:",PowerSaveMode.isEnabled() || myDisposed || !myProject.isInitialized()," activeEditors:",myProject.isDisposed() ? null : myDaemonListeners.getSelectedEditors()); - if (!myUpdateByTimerEnabled) return; - if (PowerSaveMode.isEnabled()) return; - if (myDisposed || !myProject.isInitialized()) return; - ApplicationManager.getApplication().assertIsDispatchThread(); - - final Collection activeEditors = myDaemonListeners.getSelectedEditors(); - if (activeEditors.isEmpty()) return; Editor active = FileEditorManager.getInstance(myProject).getSelectedTextEditor(); Runnable runnable = new Runnable() { public void run() { + PassExecutorService.log(myUpdateProgress, null, "Update Runnable. myUpdateByTimerEnabled:",myUpdateByTimerEnabled," something disposed:",PowerSaveMode.isEnabled() || myDisposed || !myProject.isInitialized()," activeEditors:",myProject.isDisposed() ? null : myDaemonListeners.getSelectedEditors()); + if (!myUpdateByTimerEnabled) return; + if (PowerSaveMode.isEnabled()) return; + if (myDisposed || !myProject.isInitialized()) return; + ApplicationManager.getApplication().assertIsDispatchThread(); + + final Collection activeEditors = myDaemonListeners.getSelectedEditors(); + if (activeEditors.isEmpty()) return; + ApplicationManager.getApplication().assertIsDispatchThread(); if (ApplicationManager.getApplication().isWriteAccessAllowed()) { // makes no sense to start from within write action, will cancel anyway