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

EA-26848 (check before cast, Luke)

Browse Source
This commit is contained in:
Roman Shevchenko
2011-04-11 20:20:29 +02:00
parent ce25274012
commit 59e0af7baf
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiNameValuePairImpl.java
+12 -5
View File
@@ -30,6 +30,7 @@ import com.intellij.util.ArrayUtil;
import com.intellij.util.CharTable;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* @author ven
@@ -125,11 +126,14 @@ public class PsiNameValuePairImpl extends CompositePsiElement implements PsiName
public PsiReference getReference() {
return new PsiReference() {
private PsiClass getReferencedClass () {
@Nullable
private PsiClass getReferencedClass() {
LOG.assertTrue(getParent() instanceof PsiAnnotationParameterList && getParent().getParent() instanceof PsiAnnotation);
PsiAnnotation annotation = (PsiAnnotation)getParent().getParent();
PsiJavaCodeReferenceElement nameRef = annotation.getNameReferenceElement();
return nameRef == null ? null : (PsiClass)nameRef.resolve();
if (nameRef == null) return null;
PsiElement target = nameRef.resolve();
return target instanceof PsiClass ? (PsiClass)target : null;
}
public PsiElement getElement() {
@@ -209,8 +213,8 @@ public class PsiNameValuePairImpl extends CompositePsiElement implements PsiName
public TreeElement addInternal(TreeElement first, ASTNode last, ASTNode anchor, Boolean before) {
final CharTable treeCharTab = SharedImplUtil.findCharTableByTree(this);
final TreeElement treeElement = super.addInternal(first, last, anchor, before);
if (first == last && first.getElementType() == ElementType.IDENTIFIER) {
LeafElement eq = Factory.createSingleLeafElement(ElementType.EQ, "=", 0, 1, treeCharTab, getManager());
if (first == last && first.getElementType() == JavaTokenType.IDENTIFIER) {
LeafElement eq = Factory.createSingleLeafElement(JavaTokenType.EQ, "=", 0, 1, treeCharTab, getManager());
super.addInternal(eq, eq, first, Boolean.FALSE);
}
return treeElement;
@@ -219,7 +223,10 @@ public class PsiNameValuePairImpl extends CompositePsiElement implements PsiName
public void deleteChildInternal(@NotNull ASTNode child) {
super.deleteChildInternal(child);
if (child.getElementType() == JavaTokenType.IDENTIFIER) {
super.deleteChildInternal(findChildByRole(ChildRole.OPERATION_SIGN));
final ASTNode sign = findChildByRole(ChildRole.OPERATION_SIGN);
if (sign != null) {
super.deleteChildInternal(sign);
}
}
}
}