Don't drop caches before finish/onError

(cherry picked from commit 9b7fcd4)
google · Sep 26, 2024 · 75e2082 · 75e2082
1 parent 88b5b99
commit 75e2082
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
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
@@ -515,6 +515,15 @@ class KotlinSymbolProcessing(
                 provider.create(symbolProcessorEnvironment).also { deferredSymbols[it] = mutableListOf() }
             }
 
+            fun dropCaches() {
+                KotlinGlobalModificationService.getInstance(project).publishGlobalSourceModuleStateModification()
+                KaSessionProvider.getInstance(project).clearCaches()
+                psiManager.dropResolveCaches()
+                psiManager.dropPsiCaches()
+
+                KSObjectCacheManager.clear()
+            }
+
             var rounds = 0
             // Run processors until either
             // 1) there is an error
@@ -549,18 +558,12 @@ class KotlinSymbolProcessing(
 
                 val allKSFilesPointers = allDirtyKSFiles.filterIsInstance<Deferrable>().map { it.defer() }
 
-                // Drop caches
-                KotlinGlobalModificationService.getInstance(project).publishGlobalSourceModuleStateModification()
-                KaSessionProvider.getInstance(project).clearCaches()
-                psiManager.dropResolveCaches()
-                psiManager.dropPsiCaches()
-
-                KSObjectCacheManager.clear()
-
                 if (logger.hasError || codeGenerator.generatedFile.isEmpty()) {
                     break
                 }
 
+                dropCaches()
+
                 newKSFiles = prepareNewKSFiles(
                     kotlinCoreProjectEnvironment,
                     javaFileManager,
@@ -590,6 +593,7 @@ class KotlinSymbolProcessing(
                 )
             }
 
+            dropCaches()
             codeGenerator.closeFiles()
         } finally {
             Disposer.dispose(projectDisposable)

diff --git a/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/MultipleroundProcessor.kt b/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/MultipleroundProcessor.kt
@@ -5,6 +5,8 @@ import com.google.devtools.ksp.processing.Resolver
 import com.google.devtools.ksp.processing.SymbolProcessor
 import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
 import com.google.devtools.ksp.symbol.KSAnnotated
+import com.google.devtools.ksp.symbol.KSFile
+import com.google.devtools.ksp.validate
 
 class MultipleroundProcessor : AbstractTestProcessor() {
     val result = mutableListOf<String>()
@@ -46,10 +48,20 @@ class MultipleroundProcessor : AbstractTestProcessor() {
         val allFiles = resolver.getAllFiles().map { it.fileName }
         result.add(allFiles.map { if (it in newFiles) "+$it" else it }.sorted().joinToString())
 
+        filesFromLastRound = resolver.getAllFiles()
         round++
         return emptyList()
     }
 
+    lateinit var filesFromLastRound: Sequence<KSFile>
+
+    override fun finish() {
+        val allFiles = filesFromLastRound.map { it.fileName }.joinToString(", ")
+        result.add("Finish: $allFiles")
+        assert(filesFromLastRound.all { it.validate() })
+        super.finish()
+    }
+
     lateinit var env: SymbolProcessorEnvironment
 
     override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor {

diff --git a/test-utils/testData/api/multipleround.kt b/test-utils/testData/api/multipleround.kt
@@ -45,6 +45,7 @@
 // K : I0, I1, I2, I3, I4, I5
 // J : I0, I1, I2, I3, I4, I5
 // +I5.java, I0.kt, I1.java, I2.kt, I3.java, I4.kt, J.java, K.kt
+// Finish: K.kt, J.java, I0.kt, I1.java, I2.kt, I3.java, I4.kt, I5.java
 // END
 
 // FILE: K.kt