Bump AA to 2.4.20-dev-2407

gradle.properties

diff --git a/gradle.properties b/gradle.properties
index b56dc50..7a8cdb8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@
 junitPlatformVersion=1.8.2
 googleTruthVersion=1.4.5
 
-aaKotlinBaseVersion=2.4.20-dev-835
+aaKotlinBaseVersion=2.4.20-dev-2407
 aaIntellijVersion=251.27812.49
 aaGuavaVersion=33.2.0-jre
 aaAsmVersion=9.0

kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/AbstractKSDeclarationImpl.kt

diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/AbstractKSDeclarationImpl.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/AbstractKSDeclarationImpl.kt
index 45c57f6..7710c91 100644
--- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/AbstractKSDeclarationImpl.kt
+++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/AbstractKSDeclarationImpl.kt
@@ -34,10 +34,19 @@
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiJvmModifiersOwner
 import com.intellij.psi.PsiModifierListOwner
+import com.intellij.psi.util.parentOfType
 import org.jetbrains.kotlin.analysis.api.KaExperimentalApi
-import org.jetbrains.kotlin.analysis.api.symbols.*
+import org.jetbrains.kotlin.analysis.api.symbols.KaCallableSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaClassLikeSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaClassSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaDeclarationSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaFunctionSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaJavaFieldSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaPropertySymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaSymbolOrigin
+import org.jetbrains.kotlin.analysis.api.symbols.KaTypeAliasSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
-import org.jetbrains.kotlin.analysis.utils.printer.parentOfType
+import org.jetbrains.kotlin.analysis.api.symbols.typeParameters
 import org.jetbrains.kotlin.psi.KtAnnotated
 import org.jetbrains.kotlin.psi.KtModifierListOwner
 
@@ -98,8 +107,9 @@
                 is KaClassLikeSymbol -> ktDeclarationSymbol.classId?.packageFqName?.asString()
                 is KaCallableSymbol -> ktDeclarationSymbol.callableId?.packageName?.asString()
                 else -> null
-            }?.let { KSNameImpl.getCached(it) }
-                //  null -> non top level declaration, find in parent
+            }?.let {
+                KSNameImpl.getCached(it)
+            } //  null -> non top level declaration, find in parent
                 ?: ktDeclarationSymbol.getContainingKSSymbol()?.packageName
                 ?: throw InternalKSPException(
                     "failed to find package name for $this",
@@ -122,7 +132,7 @@
         analyze {
             ktDeclarationSymbol.containingSymbol?.let {
                 ktDeclarationSymbol.getContainingKSSymbol()
-            } ?: (ktDeclarationSymbol.psi?.parentOfType<PsiClass>())?.namedClassSymbol?.let {
+            } ?: (ktDeclarationSymbol.psi?.parentOfType<PsiClass>(withSelf = false))?.namedClassSymbol?.let {
                 KSClassDeclarationImpl.getCached(it)
             } ?: ktDeclarationSymbol.toContainingFile()
         }

kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalJavaFileManager.kt

diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalJavaFileManager.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalJavaFileManager.kt
index 88df0a4..bd5ee0e 100644
--- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalJavaFileManager.kt
+++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalJavaFileManager.kt
@@ -56,7 +56,7 @@
         singleJavaFileRoots.addAll(newSingleJavaFileRoots)
 
         rootsIndex = JvmDependenciesDynamicCompoundIndex(true).apply {
-            addIndex(JvmDependenciesIndexImpl(roots, true))
+            addIndex(JvmDependenciesIndexImpl(roots))
         }
 
         val corePackageIndex = project.getService(PackageIndex::class.java) as CorePackageIndex
@@ -106,7 +106,7 @@
         singleJavaFileRoots.addAll(newSingleJavaFileRoots)
 
         rootsIndex.apply {
-            addIndex(JvmDependenciesIndexImpl(roots, true))
+            addIndex(JvmDependenciesIndexImpl(roots))
         }
 
         val corePackageIndex = project.getService(PackageIndex::class.java) as CorePackageIndex