FIR: use session symbolProvider from symbol for getting it's file

2020-12-31 12:22:47 +01:00
parent d46ad6c0ad
commit 0f2aca3280
6 changed files with 168 additions and 48 deletions
@@ -125,26 +125,25 @@ object FirSessionFactory {

            val kotlinScopeProvider = KotlinScopeProvider(::wrapScopeWithJvmMapped)

-            register(
-                FirSymbolProvider::class,
-                FirCompositeSymbolProvider(
-                    this,
-                    listOf(
-                        KotlinDeserializedJvmSymbolsProvider(
-                            this, project,
-                            packagePartProvider,
-                            javaSymbolProvider,
-                            kotlinClassFinder,
-                            javaClassFinder,
-                            kotlinScopeProvider
-                        ),
-                        FirBuiltinSymbolProvider(this, kotlinScopeProvider),
-                        FirCloneableSymbolProvider(this, kotlinScopeProvider),
+            val symbolProvider = FirCompositeSymbolProvider(
+                this,
+                listOf(
+                    KotlinDeserializedJvmSymbolsProvider(
+                        this, project,
+                        packagePartProvider,
                        javaSymbolProvider,
-                        FirDependenciesSymbolProviderImpl(this)
-                    )
+                        kotlinClassFinder,
+                        javaClassFinder,
+                        kotlinScopeProvider
+                    ),
+                    FirBuiltinSymbolProvider(this, kotlinScopeProvider),
+                    FirCloneableSymbolProvider(this, kotlinScopeProvider),
+                    javaSymbolProvider,
+                    FirDependenciesSymbolProviderImpl(this)
                )
            )
+            register(FirSymbolProvider::class, symbolProvider)
+            register(FirProvider::class, FirLibrarySessionProvider(symbolProvider))
        }
    }