From f79c0a63d2c332f1ccc8d0c9aca50770980043f0 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 3 Jan 2018 16:12:19 +0100
Subject: [PATCH] java completion: don't suggest inacessible method/constructor
 references (IDEA-182311)

---
 .../FunctionalExpressionCompletionProvider.java  | 16 ++++++++--------
 .../smartType/NoInaccessibleConstructorRef.java  | 12 ++++++++++++
 .../completion/SmartType18CompletionTest.java    |  6 ++++++
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 java/java-tests/testData/codeInsight/completion/smartType/NoInaccessibleConstructorRef.java

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java b/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java
index 21c05936c6c8..afbe0c58af60 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java
@@ -28,7 +28,6 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
-import com.intellij.psi.impl.source.resolve.JavaResolveUtil;
 import com.intellij.psi.impl.source.resolve.graphInference.FunctionalInterfaceParameterizationUtil;
 import com.intellij.psi.impl.source.tree.java.MethodReferenceResolver;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -155,7 +154,7 @@ public class FunctionalExpressionCompletionProvider extends CompletionProvider<C
       if (eachReturnType.getArrayDimensions() == 0) {
         PsiMethod[] constructors = psiClass.getConstructors();
         for (PsiMethod psiMethod : constructors) {
-          if (areParameterTypesAppropriate(psiMethod, params, substitutor, 0)) {
+          if (areParameterTypesAppropriate(psiMethod, params, substitutor, 0, originalPosition)) {
             result.consume(createConstructorReferenceLookup(functionalInterfaceType, eachReturnType));
           }
         }
@@ -232,7 +231,7 @@ public class FunctionalExpressionCompletionProvider extends CompletionProvider<C
       for (PsiMethod psiMethod : psiClass.getMethods()) {
         if (!psiMethod.hasModifierProperty(PsiModifier.STATIC) &&
             hasAppropriateReturnType(expectedReturnType, psiMethod) &&
-            areParameterTypesAppropriate(psiMethod, params, substitutor, 0)) {
+            areParameterTypesAppropriate(psiMethod, params, substitutor, 0, originalPosition)) {
           result.add(createMethodRefOnThis(functionalInterfaceType, psiMethod, first ? null : psiClass));
         }
       }
@@ -250,7 +249,7 @@ public class FunctionalExpressionCompletionProvider extends CompletionProvider<C
       for (PsiMethod psiMethod : psiClass.getMethods()) {
         if (psiMethod.hasModifierProperty(PsiModifier.STATIC) &&
             hasAppropriateReturnType(expectedReturnType, psiMethod) &&
-            areParameterTypesAppropriate(psiMethod, params, substitutor, 0)) {
+            areParameterTypesAppropriate(psiMethod, params, substitutor, 0, originalPosition)) {
           result.add(createMethodRefOnClass(functionalInterfaceType, psiMethod, psiClass));
         }
       }
@@ -275,8 +274,7 @@ public class FunctionalExpressionCompletionProvider extends CompletionProvider<C
         if (visited.add(psiMethod.getName()) &&
             !psiMethod.hasModifierProperty(PsiModifier.STATIC) &&
             hasAppropriateReturnType(expectedReturnType, psiMethod) &&
-            areParameterTypesAppropriate(psiMethod, params, substitutor, 1) &&
-            JavaResolveUtil.isAccessible(psiMethod, null, psiMethod.getModifierList(), originalPosition, null, null)) {
+            areParameterTypesAppropriate(psiMethod, params, substitutor, 1, originalPosition)) {
           LookupElement methodRefLookupElement = createMethodRefOnClass(functionalInterfaceType, psiMethod, qualifierClass);
           if (prioritize && containingClass == paramClass) {
             methodRefLookupElement = PrioritizedLookupElement.withExplicitProximity(methodRefLookupElement, 1);
@@ -293,8 +291,10 @@ public class FunctionalExpressionCompletionProvider extends CompletionProvider<C
     return returnType != null && TypeConversionUtil.isAssignable(expectedReturnType, returnType);
   }
 
-  private static boolean areParameterTypesAppropriate(PsiMethod psiMethod, PsiParameter[] params, PsiSubstitutor substitutor, int offset) {
-    final PsiParameterList parameterList = psiMethod.getParameterList();
+  private static boolean areParameterTypesAppropriate(PsiMethod psiMethod, PsiParameter[] params, PsiSubstitutor substitutor, int offset, PsiElement place) {
+    if (!PsiUtil.isAccessible(psiMethod, place, null)) return false;
+    
+    PsiParameterList parameterList = psiMethod.getParameterList();
     if (parameterList.getParametersCount() == params.length - offset) {
       final PsiParameter[] referenceMethodParams = parameterList.getParameters();
       for (int i = 0; i < params.length - offset; i++) {
diff --git a/java/java-tests/testData/codeInsight/completion/smartType/NoInaccessibleConstructorRef.java b/java/java-tests/testData/codeInsight/completion/smartType/NoInaccessibleConstructorRef.java
new file mode 100644
index 000000000000..6bda22321574
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/smartType/NoInaccessibleConstructorRef.java
@@ -0,0 +1,12 @@
+import java.util.function.Supplier;
+
+class RefMain1 {
+  {
+    Supplier<Foo> s = <caret>
+  }
+}
+
+class Foo {
+  private Foo() {
+  }
+}
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/SmartType18CompletionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/SmartType18CompletionTest.java
index 4186bd2251d2..6f3269835e63 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/SmartType18CompletionTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/SmartType18CompletionTest.java
@@ -263,4 +263,10 @@ public void testConvertToObjectStream() {
     configureByTestName();
     myFixture.assertPreferredCompletionItems(0, "isEmpty", "s -> ", "getSomeGenericValue");
   }
+
+  public void testNoInaccessibleConstructorRef() {
+    configureByTestName();
+    assertOrderedEquals(myFixture.getLookupElementStrings(), "() -> ");
+  }
+
 }