From bb9933a8f9be7cfd04eef14fb6c95811cf2fb884 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 5 Mar 2018 16:30:11 +0300 Subject: [PATCH] Reformat: structureView package --- .../KotlinInheritedMembersNodeProvider.kt | 2 +- .../KotlinStructureElementPresentation.kt | 6 ++-- .../KotlinStructureViewElement.kt | 28 ++++++++++--------- .../structureView/KotlinStructureViewModel.kt | 5 ++-- 4 files changed, 22 insertions(+), 19 deletions(-) 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 caefdf72570..ab011459e12 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 @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import java.util.* -class KotlinInheritedMembersNodeProvider: InheritedMembersNodeProvider() { +class KotlinInheritedMembersNodeProvider : InheritedMembersNodeProvider() { override fun provideNodes(node: TreeElement): Collection { if (node !is KotlinStructureViewElement) return listOf() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureElementPresentation.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureElementPresentation.kt index d09951d81ce..1a40940510f 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureElementPresentation.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureElementPresentation.kt @@ -37,9 +37,9 @@ import org.jetbrains.kotlin.resolve.OverridingUtil.filterOutOverridden import javax.swing.Icon internal class KotlinStructureElementPresentation( - private val isInherited: Boolean, - navigatablePsiElement: NavigatablePsiElement, - descriptor: DeclarationDescriptor? + private val isInherited: Boolean, + navigatablePsiElement: NavigatablePsiElement, + descriptor: DeclarationDescriptor? ) : ColoredItemPresentation, LocationPresentation { private val attributesKey = getElementAttributesKey(isInherited, navigatablePsiElement) private val elementText = getElementText(navigatablePsiElement, descriptor) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.kt index a705899e174..c513bb9d73a 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.kt @@ -34,21 +34,23 @@ import javax.swing.Icon import kotlin.properties.ReadWriteProperty import kotlin.reflect.KProperty -class KotlinStructureViewElement(val element: NavigatablePsiElement, - private val isInherited: Boolean = false) : PsiTreeElementBase(element), Queryable { +class KotlinStructureViewElement( + val element: NavigatablePsiElement, + private val isInherited: Boolean = false +) : PsiTreeElementBase(element), Queryable { private var kotlinPresentation - by AssignableLazyProperty { - KotlinStructureElementPresentation(isInherited, element, countDescriptor()) - } + by AssignableLazyProperty { + KotlinStructureElementPresentation(isInherited, element, countDescriptor()) + } var isPublic - by AssignableLazyProperty { - isPublic(countDescriptor()) - } + by AssignableLazyProperty { + isPublic(countDescriptor()) + } private set - constructor(element: NavigatablePsiElement, descriptor: DeclarationDescriptor, isInherited: Boolean) : this(element, isInherited){ + constructor(element: NavigatablePsiElement, descriptor: DeclarationDescriptor, isInherited: Boolean) : this(element, isInherited) { if (element !is KtElement) { // Avoid storing descriptor in fields kotlinPresentation = KotlinStructureElementPresentation(isInherited, element, descriptor) @@ -100,7 +102,7 @@ class KotlinStructureViewElement(val element: NavigatablePsiElement, } private fun isPublic(descriptor: DeclarationDescriptor?) = - (descriptor as? DeclarationDescriptorWithVisibility)?.visibility == Visibilities.PUBLIC + (descriptor as? DeclarationDescriptorWithVisibility)?.visibility == Visibilities.PUBLIC private fun countDescriptor(): DeclarationDescriptor? = when { !element.isValid -> null @@ -127,7 +129,7 @@ private class AssignableLazyProperty(val init: () -> T) : ReadWri } fun KtClassOrObject.getStructureDeclarations() = - (primaryConstructor?.let { listOf(it) } ?: emptyList()) + - primaryConstructorParameters.filter { it.hasValOrVar() } + - declarations + (primaryConstructor?.let { listOf(it) } ?: emptyList()) + + primaryConstructorParameters.filter { it.hasValOrVar() } + + declarations diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewModel.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewModel.kt index 2602ed41107..b906f606a1f 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewModel.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewModel.kt @@ -28,8 +28,9 @@ import org.jetbrains.kotlin.psi.KtEnumEntry import org.jetbrains.kotlin.psi.KtFile class KotlinStructureViewModel(ktFile: KtFile, editor: Editor?) : - StructureViewModelBase(ktFile, editor, KotlinStructureViewElement(ktFile, false)), - StructureViewModel.ElementInfoProvider { + StructureViewModelBase(ktFile, editor, KotlinStructureViewElement(ktFile, false)), + StructureViewModel.ElementInfoProvider { + init { withSuitableClasses(KtDeclaration::class.java) withSorters(Sorter.ALPHA_SORTER)