From 6e763f5a616369e8d952516a981ccc8cb51f9cbc Mon Sep 17 00:00:00 2001
From: "Denis.Zharkov" <denis.zharkov@jetbrains.com>
Date: Thu, 1 Jul 2021 14:24:58 +0300
Subject: [PATCH] Minor. Add review fixes

Didn't squash them because there are file-moving-renaming commits above
---
 .../declaration/FirNotImplementedOverrideChecker.kt       | 5 +++--
 .../kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt     | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirNotImplementedOverrideChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirNotImplementedOverrideChecker.kt
index ced99ab0129..6e4e7138c0b 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirNotImplementedOverrideChecker.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirNotImplementedOverrideChecker.kt
@@ -61,13 +61,14 @@ object FirNotImplementedOverrideChecker : FirClassChecker() {
         fun collectSymbol(symbol: FirCallableSymbol<*>) {
             val fir = symbol.fir as? FirCallableMemberDeclaration ?: return
 
-            if (fir.delegatedWrapperData != null) {
+            val delegatedWrapperData = fir.delegatedWrapperData
+            if (delegatedWrapperData != null) {
                 val directOverriddenMembers = classScope.getDirectOverriddenMembers(
                     symbol,
                     unwrapIntersectionAndSubstitutionOverride = true
                 )
 
-                val delegatedTo = fir.delegatedWrapperData!!.wrapped.unwrapFakeOverrides()
+                val delegatedTo = delegatedWrapperData.wrapped.unwrapFakeOverrides()
 
                 if (symbol.fir.multipleDelegatesWithTheSameSignature == true) {
                     manyImplementationsDelegationSymbols.add(symbol)
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
index db633b063bb..e1adfd815be 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
@@ -42,7 +42,7 @@ class FirDelegatedMemberScope(
         val result = mutableListOf<FirNamedFunctionSymbol>()
 
         for (delegateField in delegateFields) {
-            processFunctionsFromSpecificField(delegateField, name, result)
+            collectFunctionsFromSpecificField(delegateField, name, result)
         }
 
         result.forEach(processor)
@@ -53,7 +53,7 @@ class FirDelegatedMemberScope(
         return delegateField.returnTypeRef.coneType.scope(session, scopeSession, FakeOverrideTypeCalculator.DoNothing)
     }
 
-    private fun processFunctionsFromSpecificField(
+    private fun collectFunctionsFromSpecificField(
         delegateField: FirField,
         name: Name,
         result: MutableList<FirNamedFunctionSymbol>
@@ -109,7 +109,7 @@ class FirDelegatedMemberScope(
 
         val result = mutableListOf<FirPropertySymbol>()
         for (delegateField in delegateFields) {
-            processPropertiesFromSpecificField(delegateField, name, result)
+            collectPropertiesFromSpecificField(delegateField, name, result)
         }
 
         result.forEach(processor)
@@ -123,7 +123,7 @@ class FirDelegatedMemberScope(
         declaredMemberScope.processDeclaredConstructors(processor)
     }
 
-    private fun processPropertiesFromSpecificField(
+    private fun collectPropertiesFromSpecificField(
         delegateField: FirField,
         name: Name,
         result: MutableList<FirPropertySymbol>