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

records: rename parameter names of canonical constructors together with components

Browse Source 
IDEA-CR-57849

GitOrigin-RevId: 6d820e056aa4bd37798b9a873b8d20c6adc79b9b
This commit is contained in:
Anna.Kozlova
2020-01-31 07:42:15 +00:00
committed by intellij-monorepo-bot
parent dd9b0bbfbc
commit 2ec87504ff
4 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/rename/RenameJavaVariableProcessor.java
+16 -4
View File
@@ -14,6 +14,7 @@ import com.intellij.psi.codeStyle.VariableKind;
import com.intellij.psi.controlFlow.ControlFlowUtil;
import com.intellij.psi.search.searches.ClassInheritorsSearch;
import com.intellij.psi.search.searches.OverridingMethodsSearch;
import com.intellij.psi.util.JavaPsiRecordUtil;
import com.intellij.psi.util.PropertyUtilBase;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
@@ -133,11 +134,22 @@ public class RenameJavaVariableProcessor extends RenameJavaMemberProcessor {
if (element instanceof PsiRecordComponent) {
PsiClass containingClass = ((PsiRecordComponent)element).getContainingClass();
if (containingClass != null) {
PsiMethod explicitGetter = ContainerUtil
.find(containingClass.findMethodsByName(((PsiRecordComponent)element).getName(), false), m -> m.getParameters().length == 0);
String name = ((PsiRecordComponent)element).getName();
if (name != null) {
PsiMethod explicitGetter = ContainerUtil
.find(containingClass.findMethodsByName(name, false), m -> m.getParameters().length == 0);
if (explicitGetter != null) {
addOverriddenAndImplemented(explicitGetter, newName, null, newName, JavaCodeStyleManager.getInstance(element.getProject()), allRenames);
if (explicitGetter != null) {
addOverriddenAndImplemented(explicitGetter, newName, null, newName, JavaCodeStyleManager.getInstance(element.getProject()), allRenames);
}
PsiMethod canonicalConstructor = ContainerUtil.find(containingClass.getConstructors(), c -> JavaPsiRecordUtil.isExplicitCanonicalConstructor(c));
if (canonicalConstructor != null) {
PsiParameter parameter = ContainerUtil.find(canonicalConstructor.getParameterList().getParameters(), p -> name.equals(p.getName()));
if (parameter != null) {
allRenames.put(parameter, newName);
}
}
}
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RenameWithCanonicalConstructor.java
+10
View File
@@ -0,0 +1,10 @@
record Foo(int b<caret>ar, int foo) {
public Foo(int bar, int foo) {
this.bar = bar;
this.foo = foo;
}
Foo(int bar) {
this(bar, 0);
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RenameWithCanonicalConstructor_after.java
+10
View File
@@ -0,0 +1,10 @@
record Foo(int b<caret>az, int foo) {
public Foo(int baz, int foo) {
this.baz = baz;
this.foo = foo;
}
Foo(int bar) {
this(bar, 0);
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/LightRecordsHighlightingTest.java
+4
View File
@@ -46,6 +46,10 @@ public class LightRecordsHighlightingTest extends LightJavaCodeInsightFixtureTes
doTestRename();
}
public void testRenameWithCanonicalConstructor() {
doTestRename();
}
private void doTestRename() {
doTest();
myFixture.renameElementAtCaret("baz");