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

error highlighting: fix accessibility for diamond constructors (IDEA-212188)

Browse Source 
GitOrigin-RevId: 7193877427e50351a1171df12a431effc89b6bfd
This commit is contained in:
Anna Kozlova
2019-05-15 10:08:04 +03:00
committed by intellij-monorepo-bot
parent 2f4b69a198
commit f2014af32f
4 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
+3 -1
View File
@@ -1709,7 +1709,9 @@ public class HighlightMethodUtil {
if (staticFactory instanceof MethodCandidateInfo) {
if (((MethodCandidateInfo)staticFactory).isApplicable()) {
result = (MethodCandidateInfo)staticFactory;
constructor = ((MethodCandidateInfo)staticFactory).getElement();
if (constructor == null) {
constructor = ((MethodCandidateInfo)staticFactory).getElement();
}
}
else {
applicable = false;
java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
+4 -4
View File
@@ -249,14 +249,14 @@ public class PsiDiamondTypeImpl extends PsiDiamondType {
return JavaResolveResult.EMPTY;
}
final MethodCandidateInfo staticFactoryCandidateInfo = createMethodCandidate(staticFactory, context, false, argumentList);
final MethodCandidateInfo staticFactoryCandidateInfo = createMethodCandidate((MethodCandidateInfo)result, context, false, argumentList);
if (!staticFactory.isVarArgs()) {
return staticFactoryCandidateInfo;
}
final ArrayList<CandidateInfo> conflicts = new ArrayList<>();
conflicts.add(staticFactoryCandidateInfo);
conflicts.add(createMethodCandidate(staticFactory, context, true, argumentList));
conflicts.add(createMethodCandidate((MethodCandidateInfo)result, context, true, argumentList));
return resolver.resolveConflict(conflicts);
});
}
@@ -438,11 +438,11 @@ public class PsiDiamondTypeImpl extends PsiDiamondType {
}
private static MethodCandidateInfo createMethodCandidate(@NotNull final PsiMethod staticFactoryMethod,
private static MethodCandidateInfo createMethodCandidate(@NotNull final MethodCandidateInfo staticFactoryMethod,
final PsiElement parent,
final boolean varargs,
final PsiExpressionList argumentList) {
return new MethodCandidateInfo(staticFactoryMethod, PsiSubstitutor.EMPTY, false, false, argumentList, parent, null, null) {
return new MethodCandidateInfo(staticFactoryMethod.getElement(), PsiSubstitutor.EMPTY, !staticFactoryMethod.isAccessible(), false, argumentList, parent, null, null) {
private PsiType[] myExpressionTypes;
@Override
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/diamond/ConstructorAccessibility.java
+15
View File
@@ -0,0 +1,15 @@
interface Either {
public static final class Left<L> {
private final L value;
private Left(L value) {
this.value = value;
}
}
}
class Main {
{
new <error descr="'Left(L)' has private access in 'Either.Left'">Either.Left<></error>("");
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/lambda/Diamond8HighlightingTest.java
+4
View File
@@ -29,6 +29,10 @@ public class Diamond8HighlightingTest extends LightDaemonAnalyzerTestCase {
doTest();
}
public void testConstructorAccessibility() {
doTest();
}
public void testOuterClass() {
doTest();
}