inplace rename: check if element is valid to rename after substitution

This commit is contained in:
anna
2012-01-11 13:38:57 +01:00
parent c0f341d3e0
commit 23ca3e01de
2 changed files with 3 additions and 1 deletions
@@ -241,7 +241,7 @@ public class RenameJavaMethodProcessor extends RenameJavaMemberProcessor {
@Override
public void substituteElementToRename(@NotNull PsiElement element,
@NotNull Editor editor,
@NotNull final Editor editor,
@NotNull final Pass<PsiElement> renameCallback) {
PsiMethod psiMethod = (PsiMethod)element;
if (psiMethod.isConstructor()) {
@@ -251,6 +251,7 @@ public class RenameJavaMethodProcessor extends RenameJavaMemberProcessor {
SuperMethodWarningUtil.checkSuperMethod(psiMethod, "Rename", new PsiElementProcessor<PsiMethod>() {
@Override
public boolean execute(@NotNull PsiMethod method) {
if (!PsiElementRenameHandler.canRename(method.getProject(), editor, method)) return false;
renameCallback.pass(method);
return false;
}
@@ -175,6 +175,7 @@ public abstract class RenamePsiElementProcessor {
public void substituteElementToRename(@NotNull final PsiElement element, @NotNull Editor editor, @NotNull Pass<PsiElement> renameCallback) {
final PsiElement psiElement = substituteElementToRename(element, editor);
if (psiElement == null) return;
if (!PsiElementRenameHandler.canRename(psiElement.getProject(), editor, psiElement)) return;
renameCallback.pass(psiElement);
}