From 3cd35f8a3b3bd8385adbd8e7541a9647382290b7 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 21 Jul 2016 20:04:45 +0300 Subject: [PATCH] Rename: Fix function description in super method warning dialog #KT-12945 Fixed --- ChangeLog.md | 3 ++- .../kotlin/idea/findUsages/KotlinFindUsagesProvider.kt | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 49e13779edb..ff682acc13e 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -240,6 +240,7 @@ Using 'this' as function argument in constructor of non-final class - [`KT-12084`](https://youtrack.jetbrains.com/issue/KT-12084) Introduce Property: Do not skip outer classes if extractable expression is contained in object literal - [`KT-13082`](https://youtrack.jetbrains.com/issue/KT-13082) Rename: Fix exception on property rename preview - [`KT-13207`](https://youtrack.jetbrains.com/issue/KT-13207) Safe delete: Fix exception when removing any function in 2016.2 +- [`KT-12945`](https://youtrack.jetbrains.com/issue/KT-12945) Rename: Fix function description in super method warning dialog ##### New features @@ -252,7 +253,7 @@ Using 'this' as function argument in constructor of non-final class - [`KT-12651`](https://youtrack.jetbrains.com/issue/KT-12651) Fix exception in evaluate expression when bad identifier is used for marking object - [`KT-12896`](https://youtrack.jetbrains.com/issue/KT-12896) Fix "Step In" to inline functions for Android - [`KT-7549`](https://youtrack.jetbrains.com/issue/KT-13037) Allow to evaluate kotlin expressions in Java files - + ### JS - [`KT-3008`](https://youtrack.jetbrains.com/issue/KT-3008) Generate require.js compatible modules diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesProvider.kt index 30d8453b9ef..f2c9fa92689 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesProvider.kt @@ -22,6 +22,7 @@ import com.intellij.psi.PsiDirectory import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.PsiPackage +import org.jetbrains.kotlin.asJava.elements.KtLightElement import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers @@ -78,6 +79,7 @@ class KotlinFindUsagesProvider : FindUsagesProvider { val funDescription = "$name$paramsDescription" + (returnTypeDescription?.let { ": $it" } ?: "") return funDescription + (element.containerDescription?.let { " of $it" } ?: "") } + is KtLightElement<*, *> -> element.kotlinOrigin?.let { getDescriptiveName(it) } ?: "" else -> "" } }