From 73b961e885debd4fce7e29e4536a98426235cbde Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Thu, 17 Dec 2015 18:03:10 +0300
Subject: [PATCH] Clean project code after #KT-3996 fix

No overload resolution ambiguity in smart-casts
---
 .../jetbrains/kotlin/idea/refactoring/fqName/fqNameUtil.kt  | 3 +--
 .../structureView/KotlinInheritedMembersNodeProvider.kt     | 3 +--
 .../idea/findUsages/KotlinElementDescriptionProvider.kt     | 6 +-----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/refactoring/fqName/fqNameUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/refactoring/fqName/fqNameUtil.kt
index f5a5852b254..0e09f9f2d47 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/refactoring/fqName/fqNameUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/refactoring/fqName/fqNameUtil.kt
@@ -33,8 +33,7 @@ public fun PsiElement.getKotlinFqName(): FqName? {
     return when (element) {
         is PsiPackage -> FqName(element.getQualifiedName())
         is PsiClass -> element.getQualifiedName()?.let { FqName(it) }
-        // as is necessary because of unresolved ambiguity: KT-3996
-        is PsiMember -> (element as PsiMember).getName()?.let { name ->
+        is PsiMember -> element.getName()?.let { name ->
             val prefix = element.getContainingClass()?.getQualifiedName()
             FqName(if (prefix != null) "$prefix.$name" else name)
         }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.kt
index e9c3c008c2e..39440ff731e 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.kt
@@ -34,8 +34,7 @@ public class KotlinInheritedMembersNodeProvider: InheritedMembersNodeProvider<Tr
         val element = node.getElement()
         if (element !is KtClassOrObject) return listOf()
 
-        @Suppress("USELESS_CAST") // KT-3996 Workaround
-        val project = (element as NavigatablePsiElement).getProject()
+        val project = element.project
 
         val context = element.analyze()
         val descriptor = context[BindingContext.DECLARATION_TO_DESCRIPTOR, element]
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt
index 1e311fa6131..cd6041393d3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt
@@ -57,12 +57,8 @@ public class KotlinElementDescriptionProvider : ElementDescriptionProvider {
 
         if (targetElement !is PsiNamedElement || targetElement !is KtElement) return null
 
-        // as is necessary because of ambiguity: see KT-3996
-        val name = (targetElement as PsiNamedElement).getName()
-
         return when(location) {
-            is UsageViewLongNameLocation ->
-                name
+            is UsageViewLongNameLocation -> targetElement.getName()
             is RefactoringDescriptionLocation -> {
                 val kind = elementKind() ?: return null
                 val descriptor = targetDescriptor() ?: return null