From 88644001d3c16778870a516049673a39494ddba2 Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Fri, 15 Sep 2017 13:18:55 +0300
Subject: [PATCH] Rename heared/impl around highlighter markers

---
 .../kotlin/idea/refactoring/kotlinRefactoringUtil.kt        | 6 +++---
 .../refactoring/rename/RenameKotlinFunctionProcessor.kt     | 6 +++---
 .../idea/refactoring/rename/RenameKotlinPsiProcessor.kt     | 6 +++---
 .../refactoring/safeDelete/KotlinSafeDeleteProcessor.kt     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
index a8bbc9df464..daf216ec918 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
@@ -968,9 +968,9 @@ fun KtNamedDeclaration.isCompanionMemberOf(klass: KtClassOrObject): Boolean {
 }
 
 internal fun KtDeclaration.withExpectedActuals(): List<KtDeclaration> {
-    val header = liftToExpected() ?: return listOf(this)
-    val implementations = header.actualsForExpected()
-    return listOf(header) + implementations
+    val expect = liftToExpected() ?: return listOf(this)
+    val actuals = expect.actualsForExpected()
+    return listOf(expect) + actuals
 }
 
 internal fun KtDeclaration.resolveToExpectedDescriptorIfPossible(): DeclarationDescriptor {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt
index 578cb0f8aec..b8ac8a40cd2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt
@@ -108,10 +108,10 @@ class RenameKotlinFunctionProcessor : RenameKotlinPsiProcessor() {
             get() = originalDeclaration
     }
 
-    private fun substituteForHeaderOrImpl(element: PsiElement?) = (element?.namedUnwrappedElement as? KtNamedDeclaration)?.liftToExpected()
+    private fun substituteForExpectOrActual(element: PsiElement?) = (element?.namedUnwrappedElement as? KtNamedDeclaration)?.liftToExpected()
 
     override fun substituteElementToRename(element: PsiElement?, editor: Editor?): PsiElement?  {
-        substituteForHeaderOrImpl(element)?.let { return it }
+        substituteForExpectOrActual(element)?.let { return it }
 
         val wrappedMethod = wrapPsiMethod(element) ?: return element
 
@@ -145,7 +145,7 @@ class RenameKotlinFunctionProcessor : RenameKotlinPsiProcessor() {
             renameCallback.pass(elementToProcess)
         }
 
-        substituteForHeaderOrImpl(element)?.let { return preprocessAndPass(it) }
+        substituteForExpectOrActual(element)?.let { return preprocessAndPass(it) }
 
         val wrappedMethod = wrapPsiMethod(element) ?: return
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt
index 430f722a327..2b5c0028067 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt
@@ -71,9 +71,9 @@ abstract class RenameKotlinPsiProcessor : RenamePsiElementProcessor() {
 
         val declaration = element.namedUnwrappedElement as? KtNamedDeclaration
         if (declaration != null) {
-            declaration.liftToExpected()?.let { headerDeclaration ->
-                allRenames[headerDeclaration] = safeNewName
-                headerDeclaration.actualsForExpected().forEach { allRenames[it] = safeNewName }
+            declaration.liftToExpected()?.let { expectDeclaration ->
+                allRenames[expectDeclaration] = safeNewName
+                expectDeclaration.actualsForExpected().forEach { allRenames[it] = safeNewName }
             }
         }
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
index f7aa77b13d1..13983069692 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
@@ -417,10 +417,10 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
     ): Collection<PsiElement>? {
         when (element) {
             is KtParameter -> {
-                val headerParameter = element.liftToExpected() as? KtParameter
-                if (headerParameter != null && headerParameter != element) {
+                val expectParameter = element.liftToExpected() as? KtParameter
+                if (expectParameter != null && expectParameter != element) {
                     if (shouldAllowPropagationToExpected(element)) {
-                        return listOf(headerParameter)
+                        return listOf(expectParameter)
                     } else {
                         element.ownerFunction?.dropActualModifier = true
                         return listOf(element)