From 282f85b84f87b7ed9527c78a2beb20b897413a9a Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 18 Dec 2012 15:42:27 +0100 Subject: [PATCH] refix rename method refs --- .../source/tree/java/PsiMethodReferenceExpressionImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java index 100a001ea883..d1a4ca94bad0 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java @@ -115,8 +115,10 @@ public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase final IElementType elType = child.getElementType(); if (elType == JavaTokenType.DOUBLE_COLON) { return ChildRole.DOUBLE_COLON; - } else if (elType == JavaTokenType.IDENTIFIER || elType == JavaElementType.REFERENCE_EXPRESSION) { + } else if (elType == JavaTokenType.IDENTIFIER) { return ChildRole.REFERENCE_NAME; + } else if (elType == JavaElementType.REFERENCE_EXPRESSION) { + return ChildRole.CLASS_REFERENCE; } return ChildRole.EXPRESSION; } @@ -205,6 +207,9 @@ public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase @Override public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException { PsiElement oldIdentifier = findChildByRoleAsPsiElement(ChildRole.REFERENCE_NAME); + if (oldIdentifier == null) { + oldIdentifier = findChildByRoleAsPsiElement(ChildRole.CLASS_REFERENCE); + } if (oldIdentifier == null) { throw new IncorrectOperationException(); }