From 04bb43e907de04834699658b9ce2527f89c6a6b3 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 19 Sep 2014 11:44:34 +0400 Subject: [PATCH] Fix navigation to data class copy function --- .../org/jetbrains/jet/lang/resolve/DescriptorResolver.java | 2 +- idea/testData/resolve/references/DataClassCopy.kt | 7 +++++++ .../jet/resolve/ReferenceResolveTestGenerated.java | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 idea/testData/resolve/references/DataClassCopy.kt diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index 641548b040c..fb9ac27fe9b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -421,7 +421,7 @@ public class DescriptorResolver { Annotations.EMPTY, COPY_METHOD_NAME, CallableMemberDescriptor.Kind.SYNTHESIZED, - SourceElement.NO_SOURCE + classDescriptor.getSource() ); List parameterDescriptors = Lists.newArrayList(); diff --git a/idea/testData/resolve/references/DataClassCopy.kt b/idea/testData/resolve/references/DataClassCopy.kt new file mode 100644 index 00000000000..ff441856bc2 --- /dev/null +++ b/idea/testData/resolve/references/DataClassCopy.kt @@ -0,0 +1,7 @@ +package test + +data class D(val x: Int) + +val aaa = D(42).copy() + +// REF: (test).D diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java index e7ff7408ff3..20a078ffb34 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java @@ -93,6 +93,12 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest doTest(fileName); } + @TestMetadata("DataClassCopy.kt") + public void testDataClassCopy() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/DataClassCopy.kt"); + doTest(fileName); + } + @TestMetadata("DontImportRootScope.kt") public void testDontImportRootScope() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/DontImportRootScope.kt");