From 579e05fe92d482bbd775dfdc089c6350b73d9211 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 26 May 2015 16:03:58 +0300 Subject: [PATCH] getting rid of java in facelets --- .../psi/impl/source/codeStyle/JavaReferenceAdjuster.java | 4 +++- java/jsp-openapi/src/com/intellij/psi/jsp/JspFile.java | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaReferenceAdjuster.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaReferenceAdjuster.java index 7eb550f3426d..5295f43799b4 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaReferenceAdjuster.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaReferenceAdjuster.java @@ -191,7 +191,9 @@ public class JavaReferenceAdjuster implements ReferenceAdjuster { JspFile jspFile = JspPsiUtil.getJspFile(parent.getPsi()); if (jspFile != null) { JspClass jspClass = (JspClass)jspFile.getJavaClass(); - addReferencesInRange(array, jspClass.getNode(), startOffset, endOffset); + if (jspClass != null) { + addReferencesInRange(array, jspClass.getNode(), startOffset, endOffset); + } return; } } diff --git a/java/jsp-openapi/src/com/intellij/psi/jsp/JspFile.java b/java/jsp-openapi/src/com/intellij/psi/jsp/JspFile.java index 19c0fcc1314c..a5385c7e4655 100644 --- a/java/jsp-openapi/src/com/intellij/psi/jsp/JspFile.java +++ b/java/jsp-openapi/src/com/intellij/psi/jsp/JspFile.java @@ -18,10 +18,13 @@ package com.intellij.psi.jsp; import com.intellij.psi.PsiClass; import com.intellij.psi.ServerPageFile; import com.intellij.psi.xml.XmlTag; +import org.jetbrains.annotations.Nullable; public interface JspFile extends BaseJspFile, ServerPageFile { JspFile[] EMPTY_ARRAY = new JspFile[0]; XmlTag[] getDirectiveTagsInContext(JspDirectiveKind directiveKind); + + @Nullable PsiClass getJavaClass(); }