UPDATE_AA_VERSION: 2.1.20-dev-1729

(cherry picked from commit f21b9cd)
google · Oct 18, 2024 · d2b8f11 · d2b8f11
1 parent 0385163
commit d2b8f11
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,8 +9,8 @@ junit5Version=5.8.2
 junitPlatformVersion=1.8.2
 googleTruthVersion=1.1
 
-aaKotlinBaseVersion=2.1.0-dev-7621
-aaIntellijVersion=233.13135.103
+aaKotlinBaseVersion=2.1.20-dev-1729
+aaIntellijVersion=233.13135.128
 aaGuavaVersion=33.2.0-jre
 aaAsmVersion=9.0
 aaFastutilVersion=8.5.11-18

diff --git a/kotlin-analysis-api/build.gradle.kts b/kotlin-analysis-api/build.gradle.kts
@@ -113,7 +113,8 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-params:$junit5Version")
     testRuntimeOnly("org.junit.platform:junit-platform-suite:$junitPlatformVersion")
     testImplementation("org.jetbrains.kotlin:kotlin-compiler:$aaKotlinBaseVersion")
-    testImplementation("org.jetbrains.kotlin:kotlin-compiler-internal-test-framework:$aaKotlinBaseVersion")
+    // FIXME: use aaKotlinBaseVersion after the dependency is fixed.
+    testImplementation("org.jetbrains.kotlin:kotlin-compiler-internal-test-framework:2.1.20-dev-201")
     testImplementation(project(":common-deps"))
     testImplementation(project(":test-utils"))
 
@@ -159,6 +160,7 @@ tasks.withType<ShadowJar>().configureEach {
     archiveClassifier.set("")
     minimize {
         exclude(dependency("org.lz4:lz4-java:.*"))
+        exclude(dependency("com.github.ben-manes.caffeine:caffeine:.*"))
     }
     mergeServiceFiles()
 

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
@@ -649,6 +649,7 @@ internal val DEAR_SHADOW_JAR_PLEASE_DO_NOT_REMOVE_THESE = listOf(
     org.jetbrains.kotlin.analysis.api.impl.base.java.source.JavaElementSourceWithSmartPointerFactory::class.java,
     org.jetbrains.kotlin.analysis.api.impl.base.projectStructure.KaBaseModuleProvider::class.java,
     org.jetbrains.kotlin.analysis.api.impl.base.references.HLApiReferenceProviderService::class.java,
+    org.jetbrains.kotlin.analysis.api.fir.KaFirDefaultImportsProvider::class.java,
     org.jetbrains.kotlin.analysis.api.fir.KaFirSessionProvider::class.java,
     org.jetbrains.kotlin.analysis.api.fir.references.ReadWriteAccessCheckerFirImpl::class.java,
     org.jetbrains.kotlin.analysis.api.standalone.base.declarations.KotlinStandaloneFirDirectInheritorsProvider::class.java,
@@ -659,6 +660,7 @@ internal val DEAR_SHADOW_JAR_PLEASE_DO_NOT_REMOVE_THESE = listOf(
     org.jetbrains.kotlin.analysis.api.impl.base.permissions.KaBaseAnalysisPermissionChecker::class.java,
     org.jetbrains.kotlin.analysis.api.platform.KotlinProjectMessageBusProvider::class.java,
     org.jetbrains.kotlin.analysis.api.platform.permissions.KaAnalysisPermissionChecker::class.java,
+    org.jetbrains.kotlin.analysis.api.platform.projectStructure.KotlinSimpleGlobalSearchScopeMerger::class.java,
     org.jetbrains.kotlin.analysis.api.fir.modification.KaFirSourceModificationService::class.java,
     org.jetbrains.kotlin.analysis.api.fir.references.KotlinFirReferenceContributor::class.java,
     org.jetbrains.kotlin.light.classes.symbol.SymbolKotlinAsJavaSupport::class.java,

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
@@ -274,7 +274,8 @@ internal fun KaDeclarationContainerSymbol.getAllProperties(): Sequence<KSPropert
         this@getAllProperties.memberScope.callables { true }
             .filter {
                 it.isVisibleInClass(this@getAllProperties as KaClassSymbol) ||
-                    it.containingSymbol == this@getAllProperties
+                    it.containingSymbol == this@getAllProperties ||
+                    it.containingSymbol?.psi == this@getAllProperties.psi
             }
             .mapNotNull { callableSymbol ->
                 when (callableSymbol) {
@@ -292,7 +293,8 @@ internal fun KaDeclarationContainerSymbol.getAllFunctions(): Sequence<KSFunction
         this@getAllFunctions.memberScope.let { it.callables { true } + it.constructors }
             .filter {
                 it.isVisibleInClass(this@getAllFunctions as KaClassSymbol) ||
-                    it.containingSymbol == this@getAllFunctions
+                    it.containingSymbol == this@getAllFunctions ||
+                    it.containingSymbol?.psi == this@getAllFunctions.psi
             }
             .mapNotNull { callableSymbol ->
                 // TODO: replace with single safe cast if no more implementations of KSFunctionDeclaration is added.

diff --git a/kotlin-analysis-api/testData/parent.kt b/kotlin-analysis-api/testData/parent.kt
@@ -44,6 +44,9 @@
 // parent of Int: foo
 // parent of foo: B
 // parent of B<*>: synthetic constructor for B
+// parent of Any: (Any..Any?)
+// parent of (Any..Any?): T
+// parent of T: B
 // parent of synthetic constructor for B: B
 // parent of RGB: (RGB..RGB?)
 // parent of (RGB..RGB?): INVARIANT (RGB..RGB?)

diff --git a/kotlin-analysis-api/testData/referenceElement.kt b/kotlin-analysis-api/testData/referenceElement.kt
@@ -34,6 +34,7 @@
 // KSClassifierReferenceJavaImpl: Qualifier of Any is null
 // KSClassifierReferenceJavaImpl: Qualifier of Any is null
 // KSClassifierReferenceJavaImpl: Qualifier of Any is null
+// KSClassifierReferenceJavaImpl: Qualifier of Any is null
 // KSClassifierReferenceJavaImpl: Qualifier of H is J<INVARIANT (String..String?)>
 // KSClassifierReferenceJavaImpl: Qualifier of I is J
 // KSClassifierReferenceJavaImpl: Qualifier of String is null