From f586eebe16500e9a1ec7c33d4c952b2dc155e71a Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 18 Nov 2016 12:31:51 +0100 Subject: [PATCH] KotlinStructureViewModel: cleanup after J2K --- .../structureView/KotlinStructureViewModel.kt | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) 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 726107dea3e..2669fbdf034 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 @@ -17,31 +17,20 @@ package org.jetbrains.kotlin.idea.structureView import com.intellij.ide.structureView.StructureViewModelBase -import com.intellij.ide.util.treeView.smartTree.NodeProvider import com.intellij.ide.util.treeView.smartTree.Sorter import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFile -import java.util.Arrays - -class KotlinStructureViewModel(jetFile: KtFile) : StructureViewModelBase(jetFile, KotlinStructureViewElement(jetFile, false)) { +class KotlinStructureViewModel(ktFile: KtFile) : StructureViewModelBase(ktFile, KotlinStructureViewElement(ktFile, false)) { init { withSuitableClasses(KtDeclaration::class.java) + withSorters(Sorter.ALPHA_SORTER) } - override fun getNodeProviders(): Collection> { - return NODE_PROVIDERS - } - - override fun getSorters(): Array { - return Companion.sorters - } + override fun getNodeProviders() = NODE_PROVIDERS companion object { - private val NODE_PROVIDERS = Arrays.asList>( - KotlinInheritedMembersNodeProvider()) - - private val sorters = arrayOf(Sorter.ALPHA_SORTER) + private val NODE_PROVIDERS = listOf(KotlinInheritedMembersNodeProvider()) } }