From c29d820bfa8dcf1813951c2d43a5b39a0e9ff789 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Thu, 1 Apr 2010 14:50:57 +0400 Subject: [PATCH] fix for NPE on null myRefCountHolder --- .../daemon/impl/analysis/HighlightVisitorImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java index 248956e9e91b..9302cad27419 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java @@ -288,7 +288,7 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh @Override public void visitComment(PsiComment comment) { super.visitComment(comment); if (!myHolder.hasErrorResults()) myHolder.add(HighlightUtil.checkUnclosedComment(comment)); - if (!myHolder.hasErrorResults()) registerReferencesFromInjectedFragments(comment); + if (myRefCountHolder != null && !myHolder.hasErrorResults()) registerReferencesFromInjectedFragments(comment); } @Override public void visitContinueStatement(PsiContinueStatement statement) { @@ -519,7 +519,7 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh super.visitLiteralExpression(expression); if (myHolder.hasErrorResults()) return; myHolder.add(HighlightUtil.checkLiteralExpressionParsingError(expression)); - if (!myHolder.hasErrorResults()) registerReferencesFromInjectedFragments(expression); + if (myRefCountHolder != null && !myHolder.hasErrorResults()) registerReferencesFromInjectedFragments(expression); } @Override public void visitMethod(PsiMethod method) {