method refs: accept instance inner classes from instance methods

java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java

@@ -378,7 +378,7 @@ public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase
           final boolean staticOrValidConstructorRef = psiMethod.hasModifierProperty(PsiModifier.STATIC) || validConstructorRef;
 
           if ((parameterTypes.length == signatureParameterTypes2.length || varArgs && parameterTypes.length >= signatureParameterTypes2.length) && 
-              (!myBeginsWithReferenceType || staticOrValidConstructorRef)) {
+              (!myBeginsWithReferenceType || staticOrValidConstructorRef || (psiMethod.isConstructor() && conflict.isStaticsScopeCorrect()))) {
             boolean correct = true;
             for (int i = 0; i < parameterTypes.length; i++) {
               final PsiType type1 = parameterTypes[i];

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/ConstructorRefsInnerClasses.java

@@ -115,4 +115,37 @@ class NonStaticInner2 {
   {
      I1 i1 = NonStaticInner2.Inner :: new;
   }
-}
+}
+
+class NonStaticInner3 {
+    class Foo {
+        Foo(Integer i) {}
+        Foo() {}
+    }
+
+    interface I1<X> {
+        X m(int i);
+    }
+
+    interface I2<X> {
+        X m();
+    }
+    
+    interface I3<X> {
+        X m(NonStaticInner3 rec, int i);
+    }
+
+    interface I4<X> {
+        X m(NonStaticInner3 rec);
+    }
+
+    {
+        I1<Foo> b1 = Foo::new;
+        I2<Foo> b2 = Foo::new;
+    }
+
+    {
+        I3<Foo> b1 = Foo::new;
+        I4<Foo> b2 = Foo::new;
+    }
+}