From d24f2767663298157ac9367cf9b79a2adac6828a Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 19 Aug 2010 17:59:08 +0400 Subject: [PATCH] EA-20339 --- .../intellij/psi/impl/source/PsiParameterImpl.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java index e7dd313c5fc4..595131f23757 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java @@ -178,6 +178,7 @@ public class PsiParameterImpl extends JavaStubPsiElement imple @NotNull public PsiElement getDeclarationScope() { final PsiElement parent = getParent(); + if (parent == null) return this; if (parent instanceof PsiParameterList){ return parent.getParent(); } @@ -188,12 +189,15 @@ public class PsiParameterImpl extends JavaStubPsiElement imple return parent; } PsiElement[] children = parent.getChildren(); - for(int i = 0; i < children.length; i++){ - if (children[i].equals(this)){ - while(!(children[i] instanceof PsiCodeBlock)){ - i++; + //noinspection ConstantConditions + if (children != null) { + for(int i = 0; i < children.length; i++){ + if (children[i].equals(this)){ + while(!(children[i] instanceof PsiCodeBlock)){ + i++; + } + return children[i]; } - return children[i]; } } LOG.error("codeblock not found among parameter' "+this+" parents children: "+ Arrays.asList(children)); -- 2.32.0