From 4d075b543753686b0f0bcbefa24fd318cfe3e2a2 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 24 Jun 2014 18:06:42 +0400 Subject: [PATCH] Extract Function: Make nameForRef extension property (so that it's not overriden by delegation and parameter rename works properly) --- .../refactoring/extractFunction/ExtractionDescriptor.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionDescriptor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionDescriptor.kt index 8ea801675c4..b2dcc422396 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionDescriptor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionDescriptor.kt @@ -43,11 +43,11 @@ trait Parameter { val parameterTypeCandidates: List val receiverCandidate: Boolean - val nameForRef: String get() = mirrorVarName ?: name - fun copy(name: String, parameterType: JetType): Parameter } +val Parameter.nameForRef: String get() = mirrorVarName ?: name + data class TypeParameter( val originalDeclaration: JetTypeParameter, val originalConstraints: List