Extract Interface: Fix type import when converting parameter to property

#KT-18736 Fixed
2018-06-13 00:05:53 +03:00
parent 9b7450cfdb
commit bede2e1c16
8 changed files with 45 additions and 1 deletions
@@ -80,7 +80,17 @@ private fun KtParameter.needToBeAbstract(targetClass: KtClassOrObject): Boolean
    return hasModifier(KtTokens.ABSTRACT_KEYWORD) || targetClass is KtClass && targetClass.isInterface()
 }

-private fun KtParameter.toProperty(): KtProperty = KtPsiFactory(this).createProperty(text)
+private fun KtParameter.toProperty(): KtProperty =
+    KtPsiFactory(this)
+        .createProperty(text)
+        .also {
+            val originalTypeRef = typeReference
+            val generatedTypeRef = it.typeReference
+            if (originalTypeRef != null && generatedTypeRef != null) {
+                // Preserve copyable user data of original type reference
+                generatedTypeRef.replace(originalTypeRef)
+            }
+        }

 fun doAddCallableMember(
        memberCopy: KtCallableDeclaration,