MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 08:51:02 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-232559 Rename record component: field reference is not renamed if getter overload is present

Browse Source 
GitOrigin-RevId: 1555b2079dbba1b92d83c0638e5845efca910dc5
This commit is contained in:
Tagir Valeev
2020-02-11 15:10:03 +07:00
committed by intellij-monorepo-bot
parent e08eb714bd
commit 13edb2f136
4 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaRecordComponentSearcher.java
View File

@@ -13,6 +13,8 @@ import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
public class JavaRecordComponentSearcher extends QueryExecutorBase<PsiReference, ReferencesSearch.SearchParameters> {
@Override
public void processQuery(@NotNull ReferencesSearch.SearchParameters queryParameters, @NotNull Processor<? super PsiReference> consumer) {
@@ -50,8 +52,8 @@ public class JavaRecordComponentSearcher extends QueryExecutorBase<PsiReference,
PsiClass containingClass = recordComponent.getContainingClass();
if (containingClass == null) return null;
PsiMethod[] methods = containingClass.findMethodsByName(name, false);
if (methods.length != 1) return null;
List<PsiMethod> methods = ContainerUtil.filter(containingClass.findMethodsByName(name, false), m -> m.getParameterList().isEmpty());
if (methods.size() != 1) return null;
PsiField field = containingClass.findFieldByName(name, false);
if (field == null) return null;
@@ -60,7 +62,7 @@ public class JavaRecordComponentSearcher extends QueryExecutorBase<PsiReference,
PsiParameter parameter = compactConstructor != null
? ContainerUtil.find(compactConstructor.getParameterList().getParameters(), p -> name.equals(p.getName()))
: null;
return new RecordNavigationInfo(methods[0], field, parameter, name);
return new RecordNavigationInfo(methods.get(0), field, parameter, name);
});
}