From 6af6edb547b99ec077fd7dc9b20b0efd41f60d03 Mon Sep 17 00:00:00 2001 From: Ting-Yuan Huang Date: Tue, 29 Aug 2023 11:47:20 -0700 Subject: [PATCH] AA: bump Kotlin to 1.9.30-dev-1098 --- gradle.properties | 2 +- .../google/devtools/ksp/impl/KotlinSymbolProcessing.kt | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index ef2f711560..0b385663f8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ junit5Version=5.8.2 junitPlatformVersion=1.8.2 googleTruthVersion=1.1 -aaKotlinBaseVersion=1.9.20-dev-9102 +aakotlinBaseVersion=1.9.30-dev-1098 aaIntellijVersion=213.7172.25 aaGuavaVersion=29.0-jre aaAsmVersion=9.0 diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt index 592a55a315..1ba2d0b8fb 100644 --- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt +++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt @@ -47,6 +47,7 @@ import com.intellij.openapi.vfs.StandardFileSystems import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFileManager import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem +import com.intellij.psi.PsiFile import com.intellij.psi.PsiFileSystemItem import com.intellij.psi.PsiJavaFile import com.intellij.psi.PsiManager @@ -262,7 +263,12 @@ class KotlinSymbolProcessing( project.extensionArea, PsiTreeChangeListener.EP.name, PsiTreeChangeAdapter::class.java ) return Triple( - StandaloneAnalysisAPISession(kotlinCoreProjectEnvironment, createPackagePartProvider), + StandaloneAnalysisAPISession(kotlinCoreProjectEnvironment, createPackagePartProvider) { + // This is only used by kapt4, which should query a provider, instead of have it passed here IMHO. + // kapt4's implementation is static, which may or may not work for us depending on future use cases. + // Let's implement it later if necessary. + TODO("Not implemented yet.") + }, kotlinCoreProjectEnvironment, modules )