From d1f6e45b08185c00137380f6d21d851fde8b8062 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Fri, 21 Aug 2020 12:01:42 +0300
Subject: [PATCH] [FIR] Cleanup signature of `getNestedClassifierScope`

---
 .../FirAbstractTreeTransformerWithSuperTypes.kt        |  2 +-
 .../resolve/transformers/FirSupertypesResolution.kt    |  2 +-
 .../src/org/jetbrains/kotlin/fir/scopes/Scopes.kt      | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirAbstractTreeTransformerWithSuperTypes.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirAbstractTreeTransformerWithSuperTypes.kt
index 6669abe2da7..ab5236227ea 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirAbstractTreeTransformerWithSuperTypes.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirAbstractTreeTransformerWithSuperTypes.kt
@@ -61,7 +61,7 @@ abstract class FirAbstractTreeTransformerWithSuperTypes(
                 useSiteSession = session
             ).asReversed()
             for (superType in superTypes) {
-                session.getNestedClassifierScope(superType.lookupTag, scopeSession)?.let { nestedClassifierScope ->
+                superType.lookupTag.getNestedClassifierScope(session, scopeSession)?.let { nestedClassifierScope ->
                     val scope = nestedClassifierScope.wrapNestedClassifierScopeWithSubstitutionForSuperType(superType, session)
                     scopes.add(scope)
                 }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt
index e507a819cbc..1abc148f324 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt
@@ -150,7 +150,7 @@ private fun createScopesForNestedClasses(
             lookupInterfaces = false, deep = true, substituteTypes = true, useSiteSession = session,
             supertypeSupplier = supertypeComputationSession.supertypesSupplier
         ).asReversed().mapNotNullTo(this) {
-            session.getNestedClassifierScope(it.lookupTag, scopeSession)
+            it.lookupTag.getNestedClassifierScope(session, scopeSession)
                 ?.wrapNestedClassifierScopeWithSubstitutionForSuperType(it, session)
         }
         addIfNotNull(klass.typeParametersScope())
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt
index b81414eaa09..37f4fdc2828 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt
@@ -66,10 +66,10 @@ private fun doCreateImportingScopes(
 
 private val PACKAGE_MEMBER = scopeSessionKey<FqName, FirPackageMemberScope>()
 
-fun FirSession.getNestedClassifierScope(lookupTag: ConeClassLikeLookupTag, scopeSession: ScopeSession): FirScope? {
-    val klass = when (lookupTag) {
-        is ConeClassLookupTagWithFixedSymbol -> lookupTag.symbol.fir
-        else -> firSymbolProvider.getClassLikeSymbolByFqName(lookupTag.classId)?.fir as? FirRegularClass ?: return null
+fun ConeClassLikeLookupTag.getNestedClassifierScope(session: FirSession, scopeSession: ScopeSession): FirScope? {
+    val klass = when (this) {
+        is ConeClassLookupTagWithFixedSymbol -> symbol.fir
+        else -> session.firSymbolProvider.getClassLikeSymbolByFqName(classId)?.fir as? FirRegularClass ?: return null
     }
-    return klass.scopeProvider.getNestedClassifierScope(klass, this, scopeSession)
+    return klass.scopeProvider.getNestedClassifierScope(klass, session, scopeSession)
 }