[FIR] Move initialization of common services to FirSessionBase

2020-05-26 16:12:07 +03:00
parent 1973060e8c
commit fec3e4faf1
8 changed files with 34 additions and 64 deletions
@@ -34,15 +34,8 @@ class FirIdeJavaModuleBasedSession(
    init {
        val firIdeProvider = FirIdeProvider(project, scope, this, KotlinScopeProvider(::wrapScopeWithJvmMapped))

-        registerComponent(
-            FirProvider::class,
-            firIdeProvider
-        )
-
-        registerComponent(
-            FirIdeProvider::class,
-            firIdeProvider
-        )
+        registerComponent(FirProvider::class, firIdeProvider)
+        registerComponent(FirIdeProvider::class, firIdeProvider)

        registerComponent(
            FirSymbolProvider::class,
@@ -55,11 +48,6 @@ class FirIdeJavaModuleBasedSession(
            ) as FirSymbolProvider
        )

-        registerComponent(
-            FirCorrespondingSupertypesCache::class,
-            FirCorrespondingSupertypesCache(this)
-        )
-
        registerComponent(
            ConeCallConflictResolverFactory::class,
            JvmCallConflictResolverFactory