diff options
author | Ting-Yuan Huang <laszio@google.com> | 2024-02-02 19:42:22 -0800 |
---|---|---|
committer | KSP Auto Pick <kotlin-symbol-processing@google.com> | 2024-02-05 20:03:51 +0000 |
commit | 350b2663e68fa236cdc2620ccf5358b200491058 (patch) | |
tree | 84b9a1305689b0d4f25edacd2ff98beab6be2956 | |
parent | 13a228280505a09df67f674d1d768fac072bcc70 (diff) | |
download | ksp-350b2663e68fa236cdc2620ccf5358b200491058.tar.gz |
UPDATE AA VERSION: 2.0.0-dev-14242
annotationInDependencies is disabled in KSP2 which incorrectly adds
@ValueParameterTarget(...) on a constructor parameter to its
corresponding property.
(cherry picked from commit 42217b8cbf11609d42eee71a607e4011904c6cd8)
3 files changed, 7 insertions, 14 deletions
diff --git a/gradle.properties b/gradle.properties index 5b966bc5..89dcd706 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ junit5Version=5.8.2 junitPlatformVersion=1.8.2 googleTruthVersion=1.1 -aaKotlinBaseVersion=2.0.0-dev-12830 +aaKotlinBaseVersion=2.0.0-dev-14242 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 30322050..f4a2874a 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 @@ -50,7 +50,6 @@ import com.intellij.openapi.util.Disposer 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.PsiFileSystemItem import com.intellij.psi.PsiJavaFile import com.intellij.psi.PsiManager @@ -71,11 +70,9 @@ import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.KtSta import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.LLFirStandaloneLibrarySymbolProviderFactory import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.StandaloneProjectFactory import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getFirResolveSession -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.services.FirSealedClassInheritorsProcessorFactory +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.services.LLSealedInheritorsProviderFactory import org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.LLFirLibrarySymbolProviderFactory -import org.jetbrains.kotlin.analysis.project.structure.KtBinaryModule import org.jetbrains.kotlin.analysis.project.structure.KtModule -import org.jetbrains.kotlin.analysis.project.structure.allDirectDependencies import org.jetbrains.kotlin.analysis.project.structure.builder.KtModuleBuilder import org.jetbrains.kotlin.analysis.project.structure.builder.KtModuleProviderBuilder import org.jetbrains.kotlin.analysis.project.structure.builder.buildKtSdkModule @@ -262,12 +259,7 @@ class KotlinSymbolProcessing( kotlinCoreProjectEnvironment.project.apply { registerService( KotlinPsiDeclarationProviderFactory::class.java, - KotlinStaticPsiDeclarationProviderFactory( - this, - ktModuleProviderImpl.allKtModules.flatMap { it.allDirectDependencies() } - .filterIsInstance<KtBinaryModule>(), - kotlinCoreProjectEnvironment.environment.jarFileSystem as CoreJarFileSystem - ) + KotlinStaticPsiDeclarationProviderFactory(this) ) } @@ -343,9 +335,9 @@ class KotlinSymbolProcessing( registerService(KotlinPackageProviderFactory::class.java, IncrementalKotlinPackageProviderFactory(project)) registerService( - FirSealedClassInheritorsProcessorFactory::class.java, - object : FirSealedClassInheritorsProcessorFactory() { - override fun createSealedClassInheritorsProvider(): SealedClassInheritorsProvider { + LLSealedInheritorsProviderFactory::class.java, + object : LLSealedInheritorsProviderFactory { + override fun createSealedInheritorsProvider(): SealedClassInheritorsProvider { return SealedClassInheritorsProviderImpl } } diff --git a/test-utils/src/test/kotlin/com/google/devtools/ksp/test/KSPAATest.kt b/test-utils/src/test/kotlin/com/google/devtools/ksp/test/KSPAATest.kt index 3dcf30e3..dc978f51 100644 --- a/test-utils/src/test/kotlin/com/google/devtools/ksp/test/KSPAATest.kt +++ b/test-utils/src/test/kotlin/com/google/devtools/ksp/test/KSPAATest.kt @@ -66,6 +66,7 @@ class KSPAATest : AbstractKSPAATest() { runTest("../test-utils/testData/api/allFunctions_kt_inherits_java.kt") } + @Disabled @TestMetadata("annotationInDependencies.kt") @Test fun testAnnotationsInDependencies() { |