From 3f43ec8937414c3e6a6f18d1d4d60bc258602eb5 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 14 Feb 2014 14:18:36 +0100 Subject: [PATCH] don't do smart highlighting stuff when live template settings editor is disposed together with the project (IDEA-120651) --- .../codeInsight/template/impl/LiveTemplateSettingsEditor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java index 1257e43641d6..fe0506e9ff34 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java @@ -130,9 +130,9 @@ public class LiveTemplateSettingsEditor extends JPanel { return myTemplate; } - public void dispose() { + void dispose() { final Project project = myTemplateEditor.getProject(); - if (project != null) { + if (project != null && !project.isDisposed()) { final PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(myTemplateEditor.getDocument()); if (psiFile != null) { DaemonCodeAnalyzer.getInstance(project).setHighlightingEnabled(psiFile, true);