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

extract functional: better accessibility check

Browse Source
This commit is contained in:
Anna Kozlova
2017-06-09 12:28:26 +03:00
parent 36036f649e
commit 23cc5b9cdb
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/FunctionalInterfaceSuggester.java
+1 -5
View File
@@ -18,7 +18,6 @@ package com.intellij.codeInsight;
import com.intellij.codeInspection.java15api.Java15APIUsageInspectionBase;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.resolve.JavaResolveUtil;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.searches.AnnotatedMembersSearch;
import com.intellij.psi.util.PsiTreeUtil;
@@ -76,9 +75,6 @@ public class FunctionalInterfaceSuggester {
}
return suggestFunctionalInterfaces(method, aClass -> {
if (!JavaPsiFacade.getInstance(method.getProject()).getResolveHelper().isAccessible(aClass, method, null)) {
return null;
}
final PsiMethod interfaceMethod = LambdaUtil.getFunctionalInterfaceMethod(aClass);
if (interfaceMethod != null) {
final PsiParameter[] parameters = method.getParameterList().getParameters();
@@ -151,7 +147,7 @@ public class FunctionalInterfaceSuggester {
final Set<PsiType> types = new HashSet<>();
final Processor<PsiMember> consumer = member -> {
if (member instanceof PsiClass && Java15APIUsageInspectionBase.getLastIncompatibleLanguageLevel(member, PsiUtil.getLanguageLevel(element)) == null) {
if (!JavaResolveUtil.isAccessible(member, null, member.getModifierList(), element, null, null)) {
if (!JavaPsiFacade.getInstance(project).getResolveHelper().isAccessible(member, element, null)) {
return true;
}
ContainerUtil.addIfNotNull(types, acceptanceChecker.fun((PsiClass)member));