azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid NPE in reference

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-06-17 12:48:01 +02:00
parent 392dce3207
commit 1e0eb7692e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java
+8 -3
View File
@@ -24,7 +24,8 @@ public class JetArrayAccessExpression extends JetReferenceExpression {
@Override @Override
public PsiReference getReference() { public PsiReference getReference() {
return new JetArrayAccessReference(); JetContainerNode indicesNode = getIndicesNode();
return indicesNode == null ? null : new JetArrayAccessReference();
} }
@Override @Override
@@ -41,11 +42,15 @@ public class JetArrayAccessExpression extends JetReferenceExpression {
@NotNull @NotNull
public List<JetExpression> getIndexExpressions() { public List<JetExpression> getIndexExpressions() {
PsiElement container = findChildByType(JetNodeTypes.INDICES); PsiElement container = getIndicesNode();
if (container == null) return Collections.emptyList(); if (container == null) return Collections.emptyList();
return PsiTreeUtil.getChildrenOfTypeAsList(container, JetExpression.class); return PsiTreeUtil.getChildrenOfTypeAsList(container, JetExpression.class);
} }
private JetContainerNode getIndicesNode() {
return (JetContainerNode) findChildByType(JetNodeTypes.INDICES);
}
private class JetArrayAccessReference extends JetPsiReference implements MultiRangeReference { private class JetArrayAccessReference extends JetPsiReference implements MultiRangeReference {
@Override @Override
@@ -62,7 +67,7 @@ public class JetArrayAccessExpression extends JetReferenceExpression {
public List<TextRange> getRanges() { public List<TextRange> getRanges() {
List<TextRange> list = new ArrayList<TextRange>(); List<TextRange> list = new ArrayList<TextRange>();
JetContainerNode indices = (JetContainerNode) findChildByType(JetNodeTypes.INDICES); JetContainerNode indices = getIndicesNode();
TextRange textRange = indices.getNode().findChildByType(JetTokens.LBRACKET).getTextRange(); TextRange textRange = indices.getNode().findChildByType(JetTokens.LBRACKET).getTextRange();
TextRange lBracketRange = textRange.shiftRight(-getTextOffset()); TextRange lBracketRange = textRange.shiftRight(-getTextOffset());