From 0ba4a82ca6bf1a72e1e6f2b1d44956fa3b5291a3 Mon Sep 17 00:00:00 2001
From: qx <qx@jetbrains.com>
Date: Thu, 4 May 2017 13:37:57 +0300
Subject: [PATCH] Fixes after review: ConvertMemberToExtensionIntention.convert
 moved to companion object

---
 .../declarations/ConvertMemberToExtensionIntention.kt  | 10 ++++++----
 .../quickfix/migration/MigrateExternalExtensionFix.kt  |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt
index 98afd97e129..e2036dde036 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt
@@ -70,10 +70,6 @@ class ConvertMemberToExtensionIntention : SelfTargetingRangeIntention<KtCallable
         }
     }
 
-    fun convert(element: KtCallableDeclaration): KtCallableDeclaration {
-        return createExtensionCallableAndPrepareBodyToSelect(element).first
-    }
-
     private fun createExtensionCallableAndPrepareBodyToSelect(element: KtCallableDeclaration): Pair<KtCallableDeclaration, KtExpression?> {
         val descriptor = element.resolveToDescriptor()
         val containingClass = descriptor.containingDeclaration as ClassDescriptor
@@ -211,4 +207,10 @@ class ConvertMemberToExtensionIntention : SelfTargetingRangeIntention<KtCallable
         val text = allTypeParameters.map { it.text }.joinToString(",", "<", ">")
         return KtPsiFactory(member).createDeclaration<KtFunction>("fun $text foo()").typeParameterList
     }
+
+    companion object {
+        fun convert(element: KtCallableDeclaration): KtCallableDeclaration {
+            return ConvertMemberToExtensionIntention().createExtensionCallableAndPrepareBodyToSelect(element).first
+        }
+    }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/migration/MigrateExternalExtensionFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/migration/MigrateExternalExtensionFix.kt
index 3d38f27e3c8..248f15dccc8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/migration/MigrateExternalExtensionFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/migration/MigrateExternalExtensionFix.kt
@@ -75,7 +75,7 @@ class MigrateExternalExtensionFix(declaration: KtNamedDeclaration)
                 convertNativeAnnotationToJsName(memberDeclaration, annotations)
                 annotations.nativeAnnotation.delete()
             } else {
-                val externalDeclaration = ConvertMemberToExtensionIntention().convert(memberDeclaration)
+                val externalDeclaration = ConvertMemberToExtensionIntention.convert(memberDeclaration)
                 fixExtensionMemberDeclaration(externalDeclaration, null)
             }
         }