azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show location for local classes in Goto Class

Browse Source 
#KT-7954 Fixed
This commit is contained in:
Dmitry Jemerov
2017-05-16 18:26:38 +02:00
parent 232af8a4fc
commit f6574a475b
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/presentation/DeclarationPresenters.kt
+4 -3
View File
@@ -39,9 +39,10 @@ open class KotlinDefaultNamedDeclarationPresentation(private val declaration: Kt
override fun getPresentableText() = declaration.name override fun getPresentableText() = declaration.name
override fun getLocationString(): String? { override fun getLocationString(): String? {
if (declaration is KtFunction && declaration.isLocal) { if ((declaration is KtFunction && declaration.isLocal) || (declaration is KtClassOrObject && declaration.isLocal)) {
val containingDeclaration = declaration.getStrictParentOfType<KtDeclaration>() ?: return null val containingDeclaration = declaration.getStrictParentOfType<KtNamedDeclaration>() ?: return null
return "(in ${containingDeclaration.name})" val containerName = containingDeclaration.fqName ?: containingDeclaration.name
return "(in $containerName)"
} }
val name = declaration.fqName ?: return null val name = declaration.fqName ?: return null
val qualifiedContainer = name.parent().toString() val qualifiedContainer = name.parent().toString()
idea/testData/navigation/gotoClass/localDeclarations.kt
Vendored
+4 -4
View File
@@ -11,7 +11,7 @@ fun foo() {
} }
// SEARCH_TEXT: Local // SEARCH_TEXT: Local
// REF: LocalClass // REF: (in foo).LocalClass
// REF: LocalObject // REF: (in foo).LocalObject
// REF: LocalTrait // REF: (in foo).LocalTrait
// REF: LocalTraitWithImpl // REF: (in foo).LocalTraitWithImpl