UPDATE_AA_VERSION: 2.2.0-dev-7255

(cherry picked from commit 2217b97)

Author: ting-yuan

gradle.properties

@@ -9,7 +9,7 @@ junit5Version=5.8.2
 junitPlatformVersion=1.8.2
 googleTruthVersion=1.1
 
-aaKotlinBaseVersion=2.2.0-dev-4719
+aaKotlinBaseVersion=2.2.0-dev-7255
 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

@@ -172,7 +172,9 @@ class KotlinSymbolProcessing(
         )
 
         // replaces buildKtModuleProviderByCompilerConfiguration(compilerConfiguration)
-        val projectStructureProvider = KtModuleProviderBuilder(kotlinCoreProjectEnvironment).apply {
+        val projectStructureProvider = KtModuleProviderBuilder(
+            kotlinCoreProjectEnvironment.environment, project
+        ).apply {
             val compilerConfig = compilerConfiguration
             val platform = when (kspConfig) {
                 is KSPJvmConfig -> {
@@ -238,7 +240,7 @@ class KotlinSymbolProcessing(
             projectStructureProvider,
         )
         val ktFiles = allSourceFiles.filterIsInstance<KtFile>()
-        val libraryRoots = StandaloneProjectFactory.getAllBinaryRoots(modules, kotlinCoreProjectEnvironment)
+        val libraryRoots = StandaloneProjectFactory.getAllBinaryRoots(modules, kotlinCoreProjectEnvironment.environment)
         val createPackagePartProvider =
             StandaloneProjectFactory.createPackagePartsProvider(
                 libraryRoots,
@@ -687,9 +689,9 @@ internal val DEAR_SHADOW_JAR_PLEASE_DO_NOT_REMOVE_THESE = listOf(
     org.jetbrains.kotlin.analysis.low.level.api.fir.services.LLRealFirElementByPsiElementChooser::class.java,
     org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSessionInvalidationService::class.java,
     org.jetbrains.kotlin.analysis.low.level.api.fir.symbolProviders.factories.LLStubOriginLibrarySymbolProviderFactory::class.java,
+    org.jetbrains.kotlin.analysis.api.impl.base.java.KaBaseJavaModuleResolver::class.java,
     org.jetbrains.kotlin.analysis.api.impl.base.permissions.KaBaseAnalysisPermissionChecker::class.java,
     org.jetbrains.kotlin.analysis.api.impl.base.permissions.KaBaseAnalysisPermissionRegistry::class.java,
-    org.jetbrains.kotlin.analysis.api.impl.base.symbols.pointers.KaBasePsiSymbolPointerCreator::class.java,
     org.jetbrains.kotlin.analysis.api.permissions.KaAnalysisPermissionRegistry::class.java,
     org.jetbrains.kotlin.analysis.api.platform.KotlinProjectMessageBusProvider::class.java,
     org.jetbrains.kotlin.analysis.api.platform.permissions.KaAnalysisPermissionChecker::class.java,

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

@@ -38,7 +38,7 @@ class IncrementalJavaFileManager(val environment: KotlinCoreProjectEnvironment)
         val javaModuleGraph = JavaModuleGraph(javaModuleFinder)
         val allSourceFileRoots = sourceFiles.map { JavaRoot(it.virtualFile, JavaRoot.RootType.SOURCE) }
         val jdkRoots = getDefaultJdkModuleRoots(javaModuleFinder, javaModuleGraph)
-        val libraryRoots = StandaloneProjectFactory.getAllBinaryRoots(modules, environment)
+        val libraryRoots = StandaloneProjectFactory.getAllBinaryRoots(modules, environment.environment)
 
         val rootsWithSingleJavaFileRoots = buildList {
             addAll(libraryRoots)

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

@@ -18,7 +18,9 @@
 @file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
 package com.google.devtools.ksp.standalone
 
+import com.intellij.core.CoreApplicationEnvironment
 import com.intellij.openapi.module.Module
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.analysis.api.KaExperimentalApi
@@ -31,15 +33,15 @@ import org.jetbrains.kotlin.analysis.project.structure.builder.KtBinaryModuleBui
 import org.jetbrains.kotlin.analysis.project.structure.builder.KtModuleBuilderDsl
 import org.jetbrains.kotlin.analysis.project.structure.builder.KtModuleProviderBuilder
 import org.jetbrains.kotlin.analysis.project.structure.impl.KaLibraryModuleImpl
-import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreProjectEnvironment
 import java.nio.file.Path
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 
 @KtModuleBuilderDsl
 open class KspLibraryModuleBuilder(
-    private val kotlinCoreProjectEnvironment: KotlinCoreProjectEnvironment
+    private val coreApplicationEnvironment: CoreApplicationEnvironment,
+    private val project: Project,
 ) : KtBinaryModuleBuilder() {
     public lateinit var libraryName: String
     public var librarySources: KaLibrarySourceModule? = null
@@ -51,16 +53,18 @@ open class KspLibraryModuleBuilder(
         val binaryRoots = getBinaryRoots()
         val binaryVirtualFiles = getBinaryVirtualFiles()
         val contentScope = LibraryRootsSearchScope(
-            StandaloneProjectFactory.getVirtualFilesForLibraryRoots(binaryRoots, kotlinCoreProjectEnvironment) +
-                binaryVirtualFiles
+            StandaloneProjectFactory.getVirtualFilesForLibraryRoots(
+                binaryRoots,
+                coreApplicationEnvironment,
+            ) + binaryVirtualFiles
         )
         return KaLibraryModuleImpl(
             directRegularDependencies,
             directDependsOnDependencies,
             directFriendDependencies,
             contentScope,
             platform,
-            kotlinCoreProjectEnvironment.project,
+            project,
             binaryRoots,
             binaryVirtualFiles,
             libraryName,
@@ -75,7 +79,7 @@ inline fun KtModuleProviderBuilder.buildKspLibraryModule(init: KspLibraryModuleB
     contract {
         callsInPlace(init, InvocationKind.EXACTLY_ONCE)
     }
-    return KspLibraryModuleBuilder(kotlinCoreProjectEnvironment).apply(init).build()
+    return KspLibraryModuleBuilder(coreApplicationEnvironment, project).apply(init).build()
 }
 
 internal class SimpleTrie(paths: List<String>) {
@@ -121,8 +125,9 @@ internal class LibraryRootsSearchScope(roots: List<VirtualFile>) : GlobalSearchS
 
 @KtModuleBuilderDsl
 public class KspSdkModuleBuilder(
-    kotlinCoreProjectEnvironment: KotlinCoreProjectEnvironment
-) : KspLibraryModuleBuilder(kotlinCoreProjectEnvironment) {
+    coreApplicationEnvironment: CoreApplicationEnvironment,
+    project: Project,
+) : KspLibraryModuleBuilder(coreApplicationEnvironment, project) {
     @OptIn(KaImplementationDetail::class)
     public fun addBinaryRootsFromJdkHome(jdkHome: Path, isJre: Boolean) {
         val jdkRoots = LibraryUtils.findClassesFromJdkHome(jdkHome, isJre)
@@ -137,5 +142,5 @@ public inline fun KtModuleProviderBuilder.buildKspSdkModule(init: KspSdkModuleBu
     contract {
         callsInPlace(init, InvocationKind.EXACTLY_ONCE)
     }
-    return KspSdkModuleBuilder(kotlinCoreProjectEnvironment).apply(init).build()
+    return KspSdkModuleBuilder(coreApplicationEnvironment, project).apply(init).build()
 }

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

@@ -18,6 +18,7 @@
 @file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
 package com.google.devtools.ksp.standalone
 
+import com.intellij.core.CoreApplicationEnvironment
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
@@ -28,7 +29,6 @@ import org.jetbrains.kotlin.analysis.project.structure.builder.KtModuleBuilder
 import org.jetbrains.kotlin.analysis.project.structure.builder.KtModuleBuilderDsl
 import org.jetbrains.kotlin.analysis.project.structure.builder.KtModuleProviderBuilder
 import org.jetbrains.kotlin.analysis.project.structure.impl.KaSourceModuleImpl
-import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreProjectEnvironment
 import org.jetbrains.kotlin.config.ApiVersion
 import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.config.LanguageVersionSettings
@@ -40,7 +40,8 @@ import kotlin.contracts.contract
 
 @KtModuleBuilderDsl
 class KspModuleBuilder(
-    private val kotlinCoreProjectEnvironment: KotlinCoreProjectEnvironment,
+    private val coreApplicationEnvironment: CoreApplicationEnvironment,
+    private val project: Project
 ) : KtModuleBuilder() {
     public lateinit var moduleName: String
     public var languageVersionSettings: LanguageVersionSettings =
@@ -58,16 +59,16 @@ class KspModuleBuilder(
 
     override fun build(): KaSourceModule {
         val virtualFiles = collectVirtualFilesByRoots()
-        val psiManager = PsiManager.getInstance(kotlinCoreProjectEnvironment.project)
+        val psiManager = PsiManager.getInstance(project)
         val psiFiles = virtualFiles.mapNotNull { psiManager.findFile(it) }
-        val contentScope = IncrementalGlobalSearchScope(kotlinCoreProjectEnvironment.project, virtualFiles)
+        val contentScope = IncrementalGlobalSearchScope(project, virtualFiles)
         return KaSourceModuleImpl(
             directRegularDependencies,
             directDependsOnDependencies,
             directFriendDependencies,
             contentScope,
             platform,
-            kotlinCoreProjectEnvironment.project,
+            project,
             moduleName,
             languageVersionSettings,
             psiFiles,
@@ -77,7 +78,7 @@ class KspModuleBuilder(
     val analyzableExtensions = setOf("kt", "java", "kts")
 
     private fun collectVirtualFilesByRoots(): Set<VirtualFile> {
-        val localFileSystem = kotlinCoreProjectEnvironment.environment.localFileSystem
+        val localFileSystem = coreApplicationEnvironment.localFileSystem
         return buildSet {
             for (root in sourceRoots) {
                 val files = root.toFile().walk().filter {
@@ -115,5 +116,5 @@ public inline fun KtModuleProviderBuilder.buildKspSourceModule(
     contract {
         callsInPlace(init, InvocationKind.EXACTLY_ONCE)
     }
-    return KspModuleBuilder(kotlinCoreProjectEnvironment).apply(init).build()
+    return KspModuleBuilder(coreApplicationEnvironment, project).apply(init).build()
 }