[FIR] Make the lowest priority for OptionalAnnotationClassesProvider

This commit is contained in:
Ivan Kochurkin
2022-05-03 16:26:25 +03:00
parent e004c8e2d6
commit 1b0af2cb0e
@@ -205,10 +205,10 @@ object FirSessionFactory {
firProvider.symbolProvider, firProvider.symbolProvider,
*(incrementalCompilationContext?.previousFirSessionsSymbolProviders?.toTypedArray() ?: emptyArray()), *(incrementalCompilationContext?.previousFirSessionsSymbolProviders?.toTypedArray() ?: emptyArray()),
symbolProviderForBinariesFromIncrementalCompilation, symbolProviderForBinariesFromIncrementalCompilation,
optionalAnnotationClassesProviderForBinariesFromIncrementalCompilation,
generatedSymbolsProvider, generatedSymbolsProvider,
JavaSymbolProvider(this, projectEnvironment.getFirJavaFacade(this, moduleData, javaSourcesScope)), JavaSymbolProvider(this, projectEnvironment.getFirJavaFacade(this, moduleData, javaSourcesScope)),
dependenciesSymbolProvider, dependenciesSymbolProvider,
optionalAnnotationClassesProviderForBinariesFromIncrementalCompilation,
) )
) )
) )
@@ -273,10 +273,10 @@ object FirSessionFactory {
this, this,
listOf( listOf(
classFileBasedSymbolProvider, classFileBasedSymbolProvider,
optionalAnnotationClassesProvider,
FirBuiltinSymbolProvider(this, builtinsModuleData, kotlinScopeProvider), FirBuiltinSymbolProvider(this, builtinsModuleData, kotlinScopeProvider),
FirCloneableSymbolProvider(this, builtinsModuleData, kotlinScopeProvider), FirCloneableSymbolProvider(this, builtinsModuleData, kotlinScopeProvider),
FirDependenciesSymbolProviderImpl(this) FirDependenciesSymbolProviderImpl(this),
optionalAnnotationClassesProvider
) )
) )
register(FirSymbolProvider::class, symbolProvider) register(FirSymbolProvider::class, symbolProvider)