MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix IDEA-230545 'Search Accessors' dialog is shown simultaneously with 'Show Usages' results popup

Browse Source 
GitOrigin-RevId: 7ba3dfafc77c5ef1c18bd3dff6d82ee1ea2b5dfd
This commit is contained in:
Alexey Kudravtsev
2020-01-14 14:28:44 +03:00
committed by intellij-monorepo-bot
parent 2091a26098
commit 9c61620823
6 changed files with 56 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
java/java-psi-api/src/com/intellij/psi/util/PropertyUtilBase.java
View File

@@ -217,38 +217,23 @@ public class PropertyUtilBase {
return null;
}
@Nullable
public static PsiMethod findPropertyGetterWithType(String propertyName, boolean isStatic, PsiType type, Iterator<? extends PsiMethod> methods) {
while (methods.hasNext()) {
PsiMethod method = methods.next();
if (method.hasModifierProperty(PsiModifier.STATIC) != isStatic) continue;
if (isSimplePropertyGetter(method)) {
if (getPropertyNameByGetter(method).equals(propertyName)) {
if (type.equals(method.getReturnType())) return method;
}
}
}
return null;
public static PsiMethod findPropertyGetterWithType(@NotNull String propertyName, boolean isStatic, PsiType type, @NotNull Collection<? extends PsiMethod> methods) {
return ContainerUtil.find(methods, method ->
method.hasModifierProperty(PsiModifier.STATIC) == isStatic &&
isSimplePropertyGetter(method) &&
getPropertyNameByGetter(method).equals(propertyName) &&
type.equals(method.getReturnType()));
}
public static boolean isSimplePropertyAccessor(PsiMethod method) {
return isSimplePropertyGetter(method) || isSimplePropertySetter(method);
}
@Nullable
public static PsiMethod findPropertySetterWithType(String propertyName, boolean isStatic, PsiType type, Iterator<? extends PsiMethod> methods) {
while (methods.hasNext()) {
PsiMethod method = methods.next();
if (method.hasModifierProperty(PsiModifier.STATIC) != isStatic) continue;
if (isSimplePropertySetter(method)) {
if (getPropertyNameBySetter(method).equals(propertyName)) {
PsiType methodType = method.getParameterList().getParameters()[0].getType();
if (type.equals(methodType)) return method;
}
}
}
return null;
public static PsiMethod findPropertySetterWithType(@NotNull String propertyName, boolean isStatic, PsiType type, @NotNull Collection<? extends PsiMethod> methods) {
return ContainerUtil.find(methods, method->
method.hasModifierProperty(PsiModifier.STATIC) == isStatic &&
isSimplePropertySetter(method) &&
getPropertyNameBySetter(method).equals(propertyName) && type.equals(method.getParameterList().getParameters()[0].getType()));
}
public enum GetterFlavour {