Finally fixed KT-8751

2015-08-13 15:02:42 +03:00
parent 2f7193064f
commit 671b9f5d56
4 changed files with 21 additions and 1 deletions
@@ -266,8 +266,8 @@ class ExpectedInfos(

            //TODO: we can loose partially inferred substitution here but what to do?
            if (parameter.type.containsError()) {
-                parameter = parameter.original
                descriptor = descriptor.original
+                parameter = descriptor.valueParameters[parameter.index]
                argumentToParameter = call.mapArgumentsToParameters(descriptor)
            }

@@ -0,0 +1,6 @@
+class L<T> {}
+
+class JavaClass {
+    <T> void foo(L<T> l) {}
+}
+
@@ -0,0 +1,8 @@
+class KotlinClass : JavaClass(){
+}
+
+fun foo(c: KotlinClass, l: L<String>) {
+    c.foo(<caret>)
+}
+
+// EXIST: l
@@ -107,6 +107,12 @@ public class MultiFileSmartCompletionTestGenerated extends AbstractMultiFileSmar
        doTest(fileName);
    }

+    @TestMetadata("KT_8751_2")
+    public void testKT_8751_2() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/KT_8751_2/");
+        doTest(fileName);
+    }
+
    @TestMetadata("NoObjectDuplication")
    public void testNoObjectDuplication() throws Exception {
        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/");