diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/util.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/util.kt index 870c29cc493..4b8df6993b7 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/util.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/util.kt @@ -36,7 +36,7 @@ fun createEnhancedValueParameters( val (newType, oldParameter) = pair ValueParameterDescriptorImpl( newOwner, - null, + oldParameter, oldParameter.getIndex(), oldParameter.getAnnotations(), oldParameter.getName(), diff --git a/idea/idea-completion/testData/smartMultiFile/KT_8751/JavaClass.java b/idea/idea-completion/testData/smartMultiFile/KT_8751/JavaClass.java new file mode 100644 index 00000000000..c2a508d3cb8 --- /dev/null +++ b/idea/idea-completion/testData/smartMultiFile/KT_8751/JavaClass.java @@ -0,0 +1,3 @@ +class JavaClass { + String foo(T p){} +} \ No newline at end of file diff --git a/idea/idea-completion/testData/smartMultiFile/KT_8751/KT_8751.kt b/idea/idea-completion/testData/smartMultiFile/KT_8751/KT_8751.kt new file mode 100644 index 00000000000..aec448edc1f --- /dev/null +++ b/idea/idea-completion/testData/smartMultiFile/KT_8751/KT_8751.kt @@ -0,0 +1,5 @@ +fun foo(javaClass: JavaClass, p: String) { + javaClass.foo() +} + +// EXIST: p diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileSmartCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileSmartCompletionTestGenerated.java index 7caa52e3573..dbb69a462f9 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileSmartCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileSmartCompletionTestGenerated.java @@ -101,6 +101,12 @@ public class MultiFileSmartCompletionTestGenerated extends AbstractMultiFileSmar doTest(fileName); } + @TestMetadata("KT_8751") + public void testKT_8751() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/KT_8751/"); + doTest(fileName); + } + @TestMetadata("NoObjectDuplication") public void testNoObjectDuplication() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/");