From db0309c39d6b2a41c694cf76c9829d49f6e57d79 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Tue, 23 May 2017 17:15:55 +0300
Subject: [PATCH] Reorder

---
 .../codeInliner/UsageReplacementStrategy.kt   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInliner/UsageReplacementStrategy.kt b/idea/src/org/jetbrains/kotlin/idea/codeInliner/UsageReplacementStrategy.kt
index 6a628511ba5..a18e34d0530 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInliner/UsageReplacementStrategy.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInliner/UsageReplacementStrategy.kt
@@ -73,19 +73,6 @@ fun UsageReplacementStrategy.replaceUsagesInWholeProject(
             })
 }
 
-private fun UsageReplacementStrategy.doRefactoringInside(
-        element: KtElement, targetName: String?, targetDescriptor: DeclarationDescriptor?
-) {
-    element.forEachDescendantOfType<KtSimpleNameExpression> { usage ->
-        if (usage.isValid && usage.getReferencedName() == targetName) {
-            val context = usage.analyze(BodyResolveMode.PARTIAL)
-            if (targetDescriptor == context[BindingContext.REFERENCE_TARGET, usage]) {
-                createReplacer(usage)?.invoke()
-            }
-        }
-    }
-}
-
 fun UsageReplacementStrategy.replaceUsages(
         usages: Collection<KtSimpleNameExpression>,
         targetPsiElement: PsiElement,
@@ -196,3 +183,16 @@ private fun UsageReplacementStrategy.specialUsageProcessing(usage: KtSimpleNameE
     }
     return false
 }
+
+private fun UsageReplacementStrategy.doRefactoringInside(
+        element: KtElement, targetName: String?, targetDescriptor: DeclarationDescriptor?
+) {
+    element.forEachDescendantOfType<KtSimpleNameExpression> { usage ->
+        if (usage.isValid && usage.getReferencedName() == targetName) {
+            val context = usage.analyze(BodyResolveMode.PARTIAL)
+            if (targetDescriptor == context[BindingContext.REFERENCE_TARGET, usage]) {
+                createReplacer(usage)?.invoke()
+            }
+        }
+    }
+}