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

Reformat: structureView package

Browse Source
This commit is contained in:
Nikolay Krasko
2018-03-05 16:30:11 +03:00
parent 6c4537accc
commit bb9933a8f9
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import java.util.* import java.util.*
class KotlinInheritedMembersNodeProvider: InheritedMembersNodeProvider<TreeElement>() { class KotlinInheritedMembersNodeProvider : InheritedMembersNodeProvider<TreeElement>() {
override fun provideNodes(node: TreeElement): Collection<TreeElement> { override fun provideNodes(node: TreeElement): Collection<TreeElement> {
if (node !is KotlinStructureViewElement) return listOf() if (node !is KotlinStructureViewElement) return listOf()
idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.kt
+5 -3
View File
@@ -34,8 +34,10 @@ import javax.swing.Icon
import kotlin.properties.ReadWriteProperty import kotlin.properties.ReadWriteProperty
import kotlin.reflect.KProperty import kotlin.reflect.KProperty
class KotlinStructureViewElement(val element: NavigatablePsiElement, class KotlinStructureViewElement(
private val isInherited: Boolean = false) : PsiTreeElementBase<NavigatablePsiElement>(element), Queryable { val element: NavigatablePsiElement,
private val isInherited: Boolean = false
) : PsiTreeElementBase<NavigatablePsiElement>(element), Queryable {
private var kotlinPresentation private var kotlinPresentation
by AssignableLazyProperty { by AssignableLazyProperty {
@@ -48,7 +50,7 @@ class KotlinStructureViewElement(val element: NavigatablePsiElement,
} }
private set 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) { if (element !is KtElement) {
// Avoid storing descriptor in fields // Avoid storing descriptor in fields
kotlinPresentation = KotlinStructureElementPresentation(isInherited, element, descriptor) kotlinPresentation = KotlinStructureElementPresentation(isInherited, element, descriptor)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewModel.kt
+1
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.psi.KtFile
class KotlinStructureViewModel(ktFile: KtFile, editor: Editor?) : class KotlinStructureViewModel(ktFile: KtFile, editor: Editor?) :
StructureViewModelBase(ktFile, editor, KotlinStructureViewElement(ktFile, false)), StructureViewModelBase(ktFile, editor, KotlinStructureViewElement(ktFile, false)),
StructureViewModel.ElementInfoProvider { StructureViewModel.ElementInfoProvider {
init { init {
withSuitableClasses(KtDeclaration::class.java) withSuitableClasses(KtDeclaration::class.java)
withSorters(Sorter.ALPHA_SORTER) withSorters(Sorter.ALPHA_SORTER)