Smart completion after "by" works for generic properties too

idea/idea-completion/testData/smart/propertyDelegate/GenericVal.kt

@@ -0,0 +1,10 @@
+import kotlin.reflect.KProperty
+
+class X {
+    operator fun getValue(thisRef: List<String>, property: KProperty<*>): String = ""
+}
+
+val <T> List<T>.property: T by <caret>
+
+// EXIST: lazy
+// EXIST: X

idea/idea-completion/testData/smart/propertyDelegate/GenericVar.kt

@@ -0,0 +1,10 @@
+import kotlin.reflect.KProperty
+
+class X {
+    operator fun getValue(thisRef: List<String>, property: KProperty<*>): String = ""
+    operator fun setValue(thisRef: List<String>, property: KProperty<*>, value: String){}
+}
+
+var <T> List<T>.property: T by <caret>
+
+// EXIST: X

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java

@@ -1510,6 +1510,18 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT
             doTest(fileName);
         }
 
+        @TestMetadata("GenericVal.kt")
+        public void testGenericVal() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/propertyDelegate/GenericVal.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("GenericVar.kt")
+        public void testGenericVar() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/propertyDelegate/GenericVar.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("Order.kt")
         public void testOrder() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/propertyDelegate/Order.kt");

idea/idea-core/src/org/jetbrains/kotlin/idea/core/ExpectedInfos.kt

@@ -612,11 +612,11 @@ class ExpectedInfos(
         val property = resolutionFacade.resolveToDescriptor(propertyDeclaration) as? PropertyDescriptor ?: return null
 
         val scope = expressionWithType.getResolutionScope(bindingContext, resolutionFacade)
-        val propertyOwnerType = property.extensionReceiverParameter?.type
+        val propertyOwnerType = property.fuzzyExtensionReceiverType()
-                            ?: property.dispatchReceiverParameter?.type
+                            ?: property.dispatchReceiverParameter?.type?.let { FuzzyType(it, emptyList()) }
                             ?: return null
 
-        val explicitPropertyType = property.returnType?.check { propertyDeclaration.typeReference != null }
+        val explicitPropertyType = property.fuzzyReturnType()?.check { propertyDeclaration.typeReference != null }
         val typesWithGetDetector = TypesWithGetValueDetector(scope, indicesHelper, propertyOwnerType, explicitPropertyType)
         val typesWithSetDetector = if (property.isVar) TypesWithSetValueDetector(scope, indicesHelper, propertyOwnerType) else null
 
@@ -629,10 +629,7 @@ class ExpectedInfos(
                 val substitutedType = FuzzyType(getOperatorSubstitutor.substitute(descriptorType.type, Variance.INVARIANT)!!, descriptorType.freeParameters)
 
                 val (setValueOperator, setOperatorSubstitutor) = typesWithSetDetector.findOperator(substitutedType) ?: return null
-                val propertyType = if (explicitPropertyType != null)
+                val propertyType = explicitPropertyType ?: getValueOperator.fuzzyReturnType()!!
-                    FuzzyType(explicitPropertyType, emptyList())
-                else
-                    getValueOperator.fuzzyReturnType()!!
                 val setParamType = FuzzyType(setValueOperator.valueParameters.last().type, setValueOperator.typeParameters)
                 val setParamTypeSubstitutor = setParamType.checkIsSuperTypeOf(propertyType) ?: return null
                 return TypeSubstitutor.createChainedSubstitutor(getOperatorSubstitutor.substitution,

idea/idea-core/src/org/jetbrains/kotlin/idea/core/TypesWithOperatorDetector.kt

@@ -119,8 +119,8 @@ class TypesWithContainsDetector(
 class TypesWithGetValueDetector(
         scope: LexicalScope,
         indicesHelper: KotlinIndicesHelper?,
-        private val propertyOwnerType: KotlinType,
+        private val propertyOwnerType: FuzzyType,
-        private val propertyType: KotlinType?
+        private val propertyType: FuzzyType?
 ) : TypesWithOperatorDetector(OperatorNameConventions.GET_VALUE, scope, indicesHelper) {
 
     override fun checkIsSuitableByType(operator: FunctionDescriptor, freeTypeParams: Collection<TypeParameterDescriptor>): TypeSubstitutor? {
@@ -138,7 +138,7 @@ class TypesWithGetValueDetector(
 class TypesWithSetValueDetector(
         scope: LexicalScope,
         indicesHelper: KotlinIndicesHelper?,
-        private val propertyOwnerType: KotlinType
+        private val propertyOwnerType: FuzzyType
 ) : TypesWithOperatorDetector(OperatorNameConventions.SET_VALUE, scope, indicesHelper) {
 
     override fun checkIsSuitableByType(operator: FunctionDescriptor, freeTypeParams: Collection<TypeParameterDescriptor>): TypeSubstitutor? {