From 06a1d362d1e320d268fb604df47ed6181a14d2bd Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 8 May 2017 17:35:34 +0200 Subject: [PATCH] Pass Editor to StructureViewModel (required for autoscroll from source) #KT-17439 Fixed --- .../kotlin/idea/structureView/KotlinStructureViewFactory.java | 2 +- .../kotlin/idea/structureView/KotlinStructureViewModel.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewFactory.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewFactory.java index ef7a3302405..82dd3b9644d 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewFactory.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewFactory.java @@ -36,7 +36,7 @@ public class KotlinStructureViewFactory implements PsiStructureViewFactory { @NotNull @Override public StructureViewModel createStructureViewModel(@Nullable Editor editor) { - return new KotlinStructureViewModel(file); + return new KotlinStructureViewModel(file, editor); } }; } 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 e9fd6cfe35a..c6450116577 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 @@ -18,11 +18,12 @@ package org.jetbrains.kotlin.idea.structureView import com.intellij.ide.structureView.StructureViewModelBase import com.intellij.ide.util.treeView.smartTree.* +import com.intellij.openapi.editor.Editor import com.intellij.util.PlatformIcons import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFile -class KotlinStructureViewModel(ktFile: KtFile) : StructureViewModelBase(ktFile, KotlinStructureViewElement(ktFile, false)) { +class KotlinStructureViewModel(ktFile: KtFile, editor: Editor?) : StructureViewModelBase(ktFile, editor, KotlinStructureViewElement(ktFile, false)) { init { withSuitableClasses(KtDeclaration::class.java)