From bb0058810464beb61e716d9ab8949510a33282bb Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Thu, 22 Sep 2011 20:30:26 +0400 Subject: [PATCH] EA-29860 fix NPE --- .../tagTreeHighlighting/XmlTagTreeHighlightingPass.java | 6 +++--- .../XmlTagTreeHighlightingPassFactory.java | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java index 37d28f29e7c8..a19e444ccc3a 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java @@ -60,12 +60,12 @@ public class XmlTagTreeHighlightingPass extends TextEditorHighlightingPass { .createTextAttributesKey("TAG_TREE_HIGHLIGHTING_KEY")); private final XmlFile myFile; - private final Editor myEditor; + private final EditorEx myEditor; private final BreadcrumbsInfoProvider myInfoProvider; private final List> myPairsToHighlight = new ArrayList>(); - public XmlTagTreeHighlightingPass(@NotNull XmlFile file, @NotNull Editor editor) { + public XmlTagTreeHighlightingPass(@NotNull XmlFile file, @NotNull EditorEx editor) { super(file.getProject(), editor.getDocument(), true); myFile = file; myEditor = editor; @@ -257,7 +257,7 @@ public class XmlTagTreeHighlightingPass extends TextEditorHighlightingPass { } private Color[] toColorsForEditor(Color[] baseColors) { - final Color tagBackground = myEditor instanceof EditorEx ? ((EditorEx)myEditor).getBackgroundColor() : null; + final Color tagBackground = myEditor.getBackgroundColor(); if (tagBackground == null) { return baseColors; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPassFactory.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPassFactory.java index 5ab99bb4ea18..c6e2ceeff1dc 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPassFactory.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPassFactory.java @@ -21,6 +21,7 @@ import com.intellij.codeHighlighting.TextEditorHighlightingPassFactory; import com.intellij.codeHighlighting.TextEditorHighlightingPassRegistrar; import com.intellij.openapi.components.AbstractProjectComponent; import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.psi.xml.XmlFile; @@ -40,8 +41,9 @@ public class XmlTagTreeHighlightingPassFactory extends AbstractProjectComponent if (editor.isOneLineMode()) return null; if (!XmlTagTreeHighlightingUtil.isTagTreeHighlightingActive(file)) return null; + if (!(editor instanceof EditorEx)) return null; - return new XmlTagTreeHighlightingPass((XmlFile)file, editor); + return new XmlTagTreeHighlightingPass((XmlFile)file, (EditorEx)editor); } }