From afdd647df185e1b6a072c0901d59d930e734bd66 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Fri, 15 Sep 2017 13:28:13 +0300
Subject: [PATCH] Migration to expect/actual: renames in DeclarationsChecker

---
 .../jetbrains/kotlin/resolve/DeclarationsChecker.kt  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt
index 7b32b2ee0eb..afd2ee357c1 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt
@@ -167,11 +167,11 @@ class DeclarationsChecker(
         }
 
         if (declaration.hasActualModifier()) {
-            checkImplTypeAlias(declaration, typeAliasDescriptor)
+            checkActualTypeAlias(declaration, typeAliasDescriptor)
         }
     }
 
-    private fun checkImplTypeAlias(declaration: KtTypeAlias, typeAliasDescriptor: TypeAliasDescriptor) {
+    private fun checkActualTypeAlias(declaration: KtTypeAlias, typeAliasDescriptor: TypeAliasDescriptor) {
         val rhs = typeAliasDescriptor.underlyingType
         val classDescriptor = rhs.constructor.declarationDescriptor
         if (classDescriptor !is ClassDescriptor) {
@@ -246,10 +246,10 @@ class DeclarationsChecker(
         identifierChecker.checkDeclaration(declaration, trace)
         checkVarargParameters(trace, constructorDescriptor)
         checkConstructorVisibility(constructorDescriptor, declaration)
-        checkHeaderClassConstructor(constructorDescriptor, declaration)
+        checkExpectedClassConstructor(constructorDescriptor, declaration)
     }
 
-    private fun checkHeaderClassConstructor(constructorDescriptor: ClassConstructorDescriptor, declaration: KtConstructor<*>) {
+    private fun checkExpectedClassConstructor(constructorDescriptor: ClassConstructorDescriptor, declaration: KtConstructor<*>) {
         if (!constructorDescriptor.isExpect) return
 
         if (declaration.hasBody()) {
@@ -723,13 +723,13 @@ class DeclarationsChecker(
         }
 
         if (functionDescriptor.isExpect) {
-            checkHeaderFunction(function)
+            checkExpectedFunction(function)
         }
 
         shadowedExtensionChecker.checkDeclaration(function, functionDescriptor)
     }
 
-    private fun checkHeaderFunction(function: KtNamedFunction) {
+    private fun checkExpectedFunction(function: KtNamedFunction) {
         if (function.hasBody()) {
             trace.report(EXPECTED_DECLARATION_WITH_BODY.on(function))
         }