From f57c9279f995b361d1df1713e6112b0d2e5365f4 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 26 Jul 2016 16:45:34 +0300 Subject: [PATCH] Override/Implement Members: Support "Copy JavaDoc" options for library classes #KT-12997 Fixed --- ChangeLog.md | 1 + .../idea/core/overrideImplement/OverrideMemberChooserObject.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index d024b4a3174..ae6e9736e3f 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -161,6 +161,7 @@ These artifacts include extensions for the types available in the latter JDKs, s - [`KT-13084`](https://youtrack.jetbrains.com/issue/KT-13084) Run test method action executes all tests from same kotlin file - [`KT-12718`](https://youtrack.jetbrains.com/issue/KT-12718) Deadlock due to index reentering - [`KT-13114`](https://youtrack.jetbrains.com/issue/KT-13114) 'Unused declaration' option 'JUnit static methods' is always enabled +- [`KT-12997`](https://youtrack.jetbrains.com/issue/KT-12997) Override/Implement Members: Support "Copy JavaDoc" options for library classes - [`KT-13207`](https://youtrack.jetbrains.com/issue/KT-13207) Exception on safe delete from intention in 2016.2 - [`KT-12887`](https://youtrack.jetbrains.com/issue/KT-12887) "Extend selection" should select call's invoked expression - Fix exception when choose Gradle configurer after project is synced diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt index 99a679da06e..0fc99583f34 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt @@ -104,7 +104,7 @@ fun OverrideMemberChooserObject.generateMember(project: Project, copyDoc: Boolea } if (copyDoc) { - val superDeclaration = DescriptorToSourceUtilsIde.getAnyDeclaration(project, descriptor) + val superDeclaration = DescriptorToSourceUtilsIde.getAnyDeclaration(project, descriptor)?.navigationElement val kDoc = when (superDeclaration) { is KtDeclaration -> findDocComment(superDeclaration)