From 502cbbdfd65093df77027a4db0dcecd5af1b5366 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 12 Jul 2010 16:59:28 +0400 Subject: [PATCH] do not invoke later in tests --- .../intellij/codeInsight/daemon/impl/PsiChangeHandler.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiChangeHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiChangeHandler.java index a477b2430515..afc877a3f6dd 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiChangeHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiChangeHandler.java @@ -19,6 +19,7 @@ package com.intellij.codeInsight.daemon.impl; import com.intellij.codeInsight.daemon.ChangeLocalityDetector; import com.intellij.codeInspection.SuppressionUtil; import com.intellij.openapi.Disposable; +import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.editor.Document; @@ -166,8 +167,9 @@ public class PsiChangeHandler extends PsiTreeChangeAdapter implements Disposable private void updateByChange(PsiElement child, final boolean whitespaceOptimizationAllowed) { final Editor editor = FileEditorManager.getInstance(myProject).getSelectedTextEditor(); - if (editor != null) { - ApplicationManager.getApplication().invokeLater(new Runnable() { + Application application = ApplicationManager.getApplication(); + if (editor != null && !application.isUnitTestMode()) { + application.invokeLater(new Runnable() { public void run() { if (myProject.isDisposed()) return; EditorMarkupModel markupModel = (EditorMarkupModel)editor.getMarkupModel();