azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AA: introduce AA session and builder

Browse Source
This commit is contained in:
Jinseong Jeon
2022-06-01 14:56:18 -07:00
committed by Ilya Kirillov
parent 5585d84808
commit aef3df0336
9 changed files with 288 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-standalone/analysis-api-standalone-base/src/org/jetbrains/kotlin/analysis/api/standalone/base/project/structure/StandaloneProjectFactory.kt
+9 -7
View File
@@ -25,8 +25,7 @@ import org.jetbrains.kotlin.cli.jvm.index.SingleJavaFileRootsIndex
import org.jetbrains.kotlin.cli.jvm.modules.CliJavaModuleFinder
import org.jetbrains.kotlin.cli.jvm.modules.CliJavaModuleResolver
import org.jetbrains.kotlin.cli.jvm.modules.JavaModuleGraph
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.LanguageVersionSettings
import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.load.kotlin.MetadataFinderFactory
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory
import org.jetbrains.kotlin.resolve.ModuleAnnotationsResolver
@@ -52,8 +51,8 @@ object StandaloneProjectFactory {
projectStructureProvider: ProjectStructureProvider,
modules: List<KtModule>,
sourceFiles: List<PsiFileSystemItem>,
languageVersionSettings: LanguageVersionSettings,
jdkHome: Path?,
languageVersionSettings: LanguageVersionSettings = latestLanguageVersionSettings,
jdkHome: Path? = null,
) {
val project = environment.project
@@ -96,7 +95,7 @@ object StandaloneProjectFactory {
javaFileManager.initialize(
JvmDependenciesIndexImpl(sourceAndLibraryRoots),
listOf(
createPackagePartsProvider(languageVersionSettings, project, libraryRoots)
createPackagePartsProvider(project, libraryRoots, languageVersionSettings)
.invoke(ProjectScope.getLibrariesScope(project))
),
SingleJavaFileRootsIndex(emptyList()),
@@ -174,9 +173,9 @@ object StandaloneProjectFactory {
}
fun createPackagePartsProvider(
languageVersionSettings: LanguageVersionSettings,
project: MockProject,
libraryRoots: List<JavaRoot>
libraryRoots: List<JavaRoot>,
languageVersionSettings: LanguageVersionSettings = latestLanguageVersionSettings,
): (GlobalSearchScope) -> JvmPackagePartProvider = { scope ->
JvmPackagePartProvider(languageVersionSettings, scope).apply {
addRoots(libraryRoots, MessageCollector.NONE)
@@ -185,4 +184,7 @@ object StandaloneProjectFactory {
.addPackagePartProvider(this)
}
}
private val latestLanguageVersionSettings: LanguageVersionSettings =
LanguageVersionSettingsImpl(LanguageVersion.LATEST_STABLE, ApiVersion.LATEST)
}