UPDATE_AA_VERSION: 2.3.0-dev-7225

(cherry picked from commit c29bb6c)

Author: ting-yuan

gradle.properties

@@ -9,7 +9,7 @@ junit5Version=5.8.2
 junitPlatformVersion=1.8.2
 googleTruthVersion=1.1
 
-aaKotlinBaseVersion=2.3.0-dev-1330
+aaKotlinBaseVersion=2.3.0-dev-7225
 aaIntellijVersion=241.19416.19
 aaGuavaVersion=33.2.0-jre
 aaAsmVersion=9.0

kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt

@@ -331,7 +331,7 @@ class KotlinSymbolProcessing(
             )
             registerService(
                 KotlinDeclarationProviderFactory::class.java,
-                IncrementalKotlinDeclarationProviderFactory(this)
+                IncrementalKotlinDeclarationProviderFactory(this, kotlinCoreProjectEnvironment.environment)
             )
             registerService(
                 KotlinDirectInheritorsProvider::class.java,

kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt

@@ -54,12 +54,12 @@ import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
 import org.jetbrains.kotlin.codegen.state.InfoForMangling
 import org.jetbrains.kotlin.codegen.state.collectFunctionSignatureForManglingSuffix
 import org.jetbrains.kotlin.codegen.state.md5base64
-import org.jetbrains.kotlin.fir.analysis.checkers.getContainingClassSymbol
 import org.jetbrains.kotlin.fir.declarations.FirRegularClass
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.fir.declarations.utils.moduleName
 import org.jetbrains.kotlin.fir.java.JavaTypeParameterStack
 import org.jetbrains.kotlin.fir.java.toFirExpression
+import org.jetbrains.kotlin.fir.resolve.getContainingClassSymbol
 import org.jetbrains.kotlin.fir.symbols.SymbolInternals
 import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase
 import org.jetbrains.kotlin.fir.types.*

kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalKotlinDeclarationProviderFactory.kt

@@ -1,5 +1,6 @@
 package com.google.devtools.ksp.standalone
 
+import com.intellij.core.CoreApplicationEnvironment
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.analysis.api.platform.declarations.KotlinCompositeDeclarationProvider
@@ -14,6 +15,7 @@ import org.jetbrains.kotlin.psi.KtTypeAlias
 
 class IncrementalKotlinDeclarationProviderFactory(
     private val project: Project,
+    private val environment: CoreApplicationEnvironment,
 ) : KotlinDeclarationProviderFactory {
     private val staticFactories: MutableList<KotlinStandaloneDeclarationProviderFactory> = mutableListOf()
 
@@ -27,7 +29,12 @@ class IncrementalKotlinDeclarationProviderFactory(
 
     fun update(files: Collection<KtFile>) {
         val skipBuiltIns = staticFactories.isNotEmpty()
-        val staticFactory = KotlinStandaloneDeclarationProviderFactory(project, files, skipBuiltins = skipBuiltIns)
+        val staticFactory = KotlinStandaloneDeclarationProviderFactory(
+            project,
+            environment,
+            files,
+            skipBuiltins = skipBuiltIns
+        )
         staticFactories.add(staticFactory)
     }