From 3405051bcc65ff379bf0f268a0a81c0131fe39b8 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Fri, 26 Aug 2016 21:05:44 +0300
Subject: [PATCH] Misc: Use default presentation for KtTypeAlias  #KT-13611
 Fixed

---
 ChangeLog.md                                              | 1 +
 .../frontend/src/org/jetbrains/kotlin/psi/KtTypeAlias.kt  | 4 ++++
 idea/src/META-INF/plugin.xml                              | 2 ++
 idea/testData/navigation/gotoClass/typealias.kt           | 8 ++++----
 idea/testData/navigation/gotoSymbol/typealias.kt          | 8 ++++----
 idea/testData/resolve/references/TypeAlias.kt             | 2 +-
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 9ab05575d27..003755fa671 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -18,6 +18,7 @@
 - [`KT-13218`](https://youtrack.jetbrains.com/issue/KT-13218) Extract Function: Fix AssertionError on callable references
 - [`KT-13385`](https://youtrack.jetbrains.com/issue/KT-13385) Move: Quote package name (if necessary) when moving declarations to new file
 - [`KT-13395`](https://youtrack.jetbrains.com/issue/KT-13395) Introduce Property: Fix duplicate count in popup window
+- [`KT-13611`](https://youtrack.jetbrains.com/issue/KT-13611) Go to Class: Fix presentation of type aliases
 
 ## 1.1-M01 (EAP-1)
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeAlias.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeAlias.kt
index a95b9ba6791..70c8c1271f8 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeAlias.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeAlias.kt
@@ -17,6 +17,8 @@
 package org.jetbrains.kotlin.psi
 
 import com.intellij.lang.ASTNode
+import com.intellij.navigation.ItemPresentation
+import com.intellij.navigation.ItemPresentationProviders
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.KtNodeTypes
 import org.jetbrains.kotlin.lexer.KtTokens
@@ -40,4 +42,6 @@ class KtTypeAlias : KtTypeParameterListOwnerStub<KotlinTypeAliasStub>, KtNamedDe
     @IfNotParsed
     fun getTypeReference(): KtTypeReference? =
             findChildByType(KtNodeTypes.TYPE_REFERENCE)
+
+    override fun getPresentation() = ItemPresentationProviders.getItemPresentation(this)
 }
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index e5e56249116..a86e4b357e9 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -538,6 +538,8 @@
                               forClass="org.jetbrains.kotlin.psi.KtProperty"/>
     <itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.KtDefaultDeclarationPresenter"
                               forClass="org.jetbrains.kotlin.psi.KtParameter"/>
+    <itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.KtDefaultDeclarationPresenter"
+                              forClass="org.jetbrains.kotlin.psi.KtTypeAlias"/>
 
     <gotoTargetRendererProvider id="JetGotoTargetRenderProvider" implementation="org.jetbrains.kotlin.idea.KotlinGotoTargetRenderProvider"
                                 order="first"/>
diff --git a/idea/testData/navigation/gotoClass/typealias.kt b/idea/testData/navigation/gotoClass/typealias.kt
index 2a38b3662e1..b28286d4b9e 100644
--- a/idea/testData/navigation/gotoClass/typealias.kt
+++ b/idea/testData/navigation/gotoClass/typealias.kt
@@ -17,7 +17,7 @@ class Some() {
 }
 
 // SEARCH_TEXT: Test
-// REF: typealias TestGlobal = Any
-// REF: typealias TestInClass = Any
-// REF: typealias TestInClassObject = Any
-// REF: typealias TestInTrait = Any
+// REF: (<root>).TestGlobal
+// REF: (in Some).TestInClass
+// REF: (in Some.Companion).TestInClassObject
+// REF: (in SomeTrait).TestInTrait
\ No newline at end of file
diff --git a/idea/testData/navigation/gotoSymbol/typealias.kt b/idea/testData/navigation/gotoSymbol/typealias.kt
index db41b921c8a..f30942d792a 100644
--- a/idea/testData/navigation/gotoSymbol/typealias.kt
+++ b/idea/testData/navigation/gotoSymbol/typealias.kt
@@ -17,7 +17,7 @@ class Some() {
 }
 
 // SEARCH_TEXT: test
-// REF: typealias testGlobal = Any
-// REF: typealias testInClass = Any
-// REF: typealias testInClassObject = Any
-// REF: typealias testInTrait = Any
+// REF: (<root>).testGlobal
+// REF: (in Some).testInClass
+// REF: (in Some.Companion).testInClassObject
+// REF: (in SomeTrait).testInTrait
\ No newline at end of file
diff --git a/idea/testData/resolve/references/TypeAlias.kt b/idea/testData/resolve/references/TypeAlias.kt
index f252541eca0..6fc2e62b7e7 100644
--- a/idea/testData/resolve/references/TypeAlias.kt
+++ b/idea/testData/resolve/references/TypeAlias.kt
@@ -6,4 +6,4 @@ typealias CA = C
 
 val x: <caret>CA = CA()
 
-// REF: typealias CA = C
+// REF: (test).CA