Misc: Use default presentation for KtTypeAlias

#KT-13611 Fixed
This commit is contained in:
Alexey Sedunov
2016-08-26 21:05:44 +03:00
parent 60a09ecb45
commit 3405051bcc
6 changed files with 16 additions and 9 deletions
+1
View File
@@ -18,6 +18,7 @@
- [`KT-13218`](https://youtrack.jetbrains.com/issue/KT-13218) Extract Function: Fix AssertionError on callable references - [`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-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-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) ## 1.1-M01 (EAP-1)
@@ -17,6 +17,8 @@
package org.jetbrains.kotlin.psi package org.jetbrains.kotlin.psi
import com.intellij.lang.ASTNode import com.intellij.lang.ASTNode
import com.intellij.navigation.ItemPresentation
import com.intellij.navigation.ItemPresentationProviders
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.KtNodeTypes
import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.lexer.KtTokens
@@ -40,4 +42,6 @@ class KtTypeAlias : KtTypeParameterListOwnerStub<KotlinTypeAliasStub>, KtNamedDe
@IfNotParsed @IfNotParsed
fun getTypeReference(): KtTypeReference? = fun getTypeReference(): KtTypeReference? =
findChildByType(KtNodeTypes.TYPE_REFERENCE) findChildByType(KtNodeTypes.TYPE_REFERENCE)
override fun getPresentation() = ItemPresentationProviders.getItemPresentation(this)
} }
+2
View File
@@ -538,6 +538,8 @@
forClass="org.jetbrains.kotlin.psi.KtProperty"/> forClass="org.jetbrains.kotlin.psi.KtProperty"/>
<itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.KtDefaultDeclarationPresenter" <itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.KtDefaultDeclarationPresenter"
forClass="org.jetbrains.kotlin.psi.KtParameter"/> 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" <gotoTargetRendererProvider id="JetGotoTargetRenderProvider" implementation="org.jetbrains.kotlin.idea.KotlinGotoTargetRenderProvider"
order="first"/> order="first"/>
+4 -4
View File
@@ -17,7 +17,7 @@ class Some() {
} }
// SEARCH_TEXT: Test // SEARCH_TEXT: Test
// REF: typealias TestGlobal = Any // REF: (<root>).TestGlobal
// REF: typealias TestInClass = Any // REF: (in Some).TestInClass
// REF: typealias TestInClassObject = Any // REF: (in Some.Companion).TestInClassObject
// REF: typealias TestInTrait = Any // REF: (in SomeTrait).TestInTrait
+4 -4
View File
@@ -17,7 +17,7 @@ class Some() {
} }
// SEARCH_TEXT: test // SEARCH_TEXT: test
// REF: typealias testGlobal = Any // REF: (<root>).testGlobal
// REF: typealias testInClass = Any // REF: (in Some).testInClass
// REF: typealias testInClassObject = Any // REF: (in Some.Companion).testInClassObject
// REF: typealias testInTrait = Any // REF: (in SomeTrait).testInTrait
+1 -1
View File
@@ -6,4 +6,4 @@ typealias CA = C
val x: <caret>CA = CA() val x: <caret>CA = CA()
// REF: typealias CA = C // REF: (test).CA