From cabc663426adc19e705dd5d1e30be781db1ada24 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Fri, 27 Dec 2019 15:44:09 +0700 Subject: [PATCH] IDEA-229888 In-place rename for pattern variable GitOrigin-RevId: 9d48ac1e4b40cc5574a4c052b021a9454ebce005 --- .../intellij/lang/java/JavaRefactoringSupportProvider.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/lang/java/JavaRefactoringSupportProvider.java b/java/java-impl/src/com/intellij/lang/java/JavaRefactoringSupportProvider.java index 7def0a7940d2..8d16ead06b43 100644 --- a/java/java-impl/src/com/intellij/lang/java/JavaRefactoringSupportProvider.java +++ b/java/java-impl/src/com/intellij/lang/java/JavaRefactoringSupportProvider.java @@ -8,6 +8,7 @@ import com.intellij.psi.search.LocalSearchScope; import com.intellij.psi.search.PsiSearchHelper; import com.intellij.psi.search.SearchScope; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.util.PsiUtil; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.actions.IntroduceFunctionalParameterHandler; import com.intellij.refactoring.changeSignature.ChangeSignatureHandler; @@ -123,9 +124,7 @@ public class JavaRefactoringSupportProvider extends RefactoringSupportProvider { public static boolean mayRenameInplace(PsiElement elementToRename, final PsiElement nameSuggestionContext) { if (nameSuggestionContext != null && nameSuggestionContext.getContainingFile() != elementToRename.getContainingFile()) return false; - if (!(elementToRename instanceof PsiLocalVariable) && - !(elementToRename instanceof PsiParameter) && - !(elementToRename instanceof PsiLabeledStatement)) { + if (!PsiUtil.isJvmLocalVariable(elementToRename) && !(elementToRename instanceof PsiLabeledStatement)) { return false; } SearchScope useScope = PsiSearchHelper.getInstance(elementToRename.getProject()).getUseScope(elementToRename);