Introduce Variable: Fix offset to start template at

#KT-8162 Fixed
This commit is contained in:
Alexey Sedunov
2015-06-24 11:29:53 +03:00
parent 1469275a5a
commit 5fb37097dc
3 changed files with 4 additions and 1 deletions
@@ -37,12 +37,13 @@ import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import java.awt.BorderLayout import java.awt.BorderLayout
public abstract class AbstractKotlinInplaceIntroducer<D: JetNamedDeclaration>( public abstract class AbstractKotlinInplaceIntroducer<D: JetNamedDeclaration>(
localVariable: D?,
expression: JetExpression?, expression: JetExpression?,
occurrences: Array<JetExpression>, occurrences: Array<JetExpression>,
title: String, title: String,
project: Project, project: Project,
editor: Editor editor: Editor
): AbstractInplaceIntroducer<D, JetExpression>(project, editor, expression, null, occurrences, title, JetFileType.INSTANCE) { ): AbstractInplaceIntroducer<D, JetExpression>(project, editor, expression, localVariable, occurrences, title, JetFileType.INSTANCE) {
protected fun initFormComponents(init: FormBuilder.() -> Unit) { protected fun initFormComponents(init: FormBuilder.() -> Unit) {
myWholePanel.setLayout(BorderLayout()) myWholePanel.setLayout(BorderLayout())
@@ -53,6 +53,7 @@ public class KotlinInplaceParameterIntroducer(
project: Project, project: Project,
editor: Editor editor: Editor
): AbstractKotlinInplaceIntroducer<JetParameter>( ): AbstractKotlinInplaceIntroducer<JetParameter>(
null,
originalDescriptor.originalRange.elements.single() as JetExpression, originalDescriptor.originalRange.elements.single() as JetExpression,
originalDescriptor.occurrencesToReplace originalDescriptor.occurrencesToReplace
.map { it.elements.single() as JetExpression } .map { it.elements.single() as JetExpression }
@@ -52,6 +52,7 @@ public class KotlinVariableInplaceIntroducer(
project: Project, project: Project,
editor: Editor editor: Editor
): AbstractKotlinInplaceIntroducer<JetProperty>( ): AbstractKotlinInplaceIntroducer<JetProperty>(
addedVariable,
originalExpression, originalExpression,
occurrencesToReplace, occurrencesToReplace,
KotlinIntroduceVariableHandler.INTRODUCE_VARIABLE, KotlinIntroduceVariableHandler.INTRODUCE_VARIABLE,