UPDATE AA VERSION: 2.0.0-dev-7674

(cherry picked from commit c3b5f72)
google · Nov 22, 2023 · 80447d5 · 80447d5
1 parent cdc6517
commit 80447d5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git 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-6573
+aaKotlinBaseVersion=2.0.0-dev-7674
 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
@@ -69,8 +69,6 @@ import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.Stand
 import org.jetbrains.kotlin.analysis.low.level.api.fir.api.services.FirSealedClassInheritorsProcessorFactory
 import org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.LLFirLibrarySymbolProviderFactory
 import org.jetbrains.kotlin.analysis.project.structure.KtModule
-import org.jetbrains.kotlin.analysis.project.structure.KtModuleScopeProvider
-import org.jetbrains.kotlin.analysis.project.structure.KtModuleScopeProviderImpl
 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
@@ -289,11 +287,10 @@ class KotlinSymbolProcessing(
                 KtAlwaysAccessibleLifeTimeTokenProvider::class.java
             )
 
-            registerService(KtModuleScopeProvider::class.java, KtModuleScopeProviderImpl())
             // Despite being a static implementation, this is only used by IDE tests
             registerService(
                 KotlinAnnotationsResolverFactory::class.java,
-                KotlinStaticAnnotationsResolverFactory(ktFiles)
+                KotlinStaticAnnotationsResolverFactory(project, ktFiles)
             )
             registerService(
                 KotlinResolutionScopeProvider::class.java,

diff --git a/...ain/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/synthetic/KSSyntheticAnnotations.kt b/...ain/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/synthetic/KSSyntheticAnnotations.kt
@@ -8,5 +8,6 @@ fun getExtensionFunctionTypeAnnotation(index: Int) = KtAnnotationApplicationWith
     null,
     null,
     emptyList(),
-    index
+    index,
+    null
 )
diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt
@@ -447,11 +447,12 @@ internal fun KtValueParameterSymbol.getDefaultValue(): KtAnnotationValue? {
                 )
                 (this as? KtFirValueParameterSymbol)?.let {
                     val firSession = it.firSymbol.fir.moduleData.session
+                    val symbolBuilder = it.builder
                     val expectedTypeRef = it.firSymbol.fir.returnTypeRef
                     val expression = defaultValue
                         ?.toFirExpression(firSession, JavaTypeParameterStack.EMPTY, expectedTypeRef)
                     expression?.let {
-                        FirAnnotationValueConverter.toConstantValue(expression, firSession)
+                        FirAnnotationValueConverter.toConstantValue(expression, symbolBuilder)
                     }
                 }
             }
-Original file line number
+Diff line change
@@ Expand Up @@
         null,
         null,
         emptyList(),
-        index
+        index,
+        null
     )