MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 06:05:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

NPE (IDEA-66164)

Browse Source
This commit is contained in:
anna
2011-03-07 11:14:43 +01:00
parent 32c493302d
commit 9372039c59
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/controlFlow/LocalsControlFlowPolicy.java
+3
View File
@@ -16,6 +16,7 @@
package com.intellij.psi.controlFlow;
import com.intellij.psi.*;
import org.jetbrains.annotations.Nullable;
public class LocalsControlFlowPolicy implements ControlFlowPolicy {
private final PsiElement myCodeFragment;
@@ -36,6 +37,7 @@ public class LocalsControlFlowPolicy implements ControlFlowPolicy {
}
}
@Nullable
private PsiVariable checkCodeFragment(PsiElement refElement) {
PsiElement codeFragement;
if (refElement instanceof PsiParameter
@@ -45,6 +47,7 @@ public class LocalsControlFlowPolicy implements ControlFlowPolicy {
else{
codeFragement = ControlFlowUtil.findCodeFragment(refElement);
}
if (codeFragement == null) return null;
if (myCodeFragment.getContainingFile() == codeFragement.getContainingFile() && //In order for jsp includes to work
!myCodeFragment.equals(codeFragement)) return null;
return (PsiVariable)refElement;