Clear caches before early exit

google · Jul 3, 2024 · dc38b13 · dc38b13
1 parent ad8a047
commit dc38b13
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 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
@@ -541,10 +541,6 @@ class KotlinSymbolProcessing(
                 }
             }
 
-            if (logger.hasError || codeGenerator.generatedFile.isEmpty()) {
-                break
-            }
-
             // Drop caches
             KotlinGlobalModificationService.getInstance(project).publishGlobalSourceModuleStateModification()
             KtAnalysisSessionProvider.getInstance(project).clearCaches()
@@ -553,6 +549,10 @@ class KotlinSymbolProcessing(
 
             KSObjectCacheManager.clear()
 
+            if (logger.hasError || codeGenerator.generatedFile.isEmpty()) {
+                break
+            }
+
             newKSFiles = prepareNewKSFiles(
                 kotlinCoreProjectEnvironment,
                 javaFileManager,

diff --git a/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/KSPAATest.kt b/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/KSPAATest.kt
@@ -145,16 +145,16 @@ class KSPAATest : AbstractKSPAATest() {
         runTest("../test-utils/testData/api/builtInTypes.kt")
     }
 
-    @TestMetadata("A.kt")
+    @TestMetadata("objCacheA.kt")
     @Test
-    fun testA() {
-        runTest("../test-utils/testData/api/A.kt")
+    fun testObjCacheA() {
+        runTest("../test-utils/testData/api/objCacheA.kt")
     }
 
-    @TestMetadata("B.kt")
+    @TestMetadata("objCacheB.kt")
     @Test
-    fun testB() {
-        runTest("../test-utils/testData/api/B.kt")
+    fun testObjCacheB() {
+        runTest("../test-utils/testData/api/objCacheB.kt")
     }
 
     @Disabled

diff --git a/...ogle/devtools/ksp/processor/AProcessor.kt → ...tools/ksp/processor/ObjCacheAProcessor.kt b/...ogle/devtools/ksp/processor/AProcessor.kt → ...tools/ksp/processor/ObjCacheAProcessor.kt
@@ -6,7 +6,7 @@ import com.google.devtools.ksp.getDeclaredProperties
 import com.google.devtools.ksp.processing.Resolver
 import com.google.devtools.ksp.symbol.KSAnnotated
 
-open class AProcessor : AbstractTestProcessor() {
+open class ObjCacheAProcessor : AbstractTestProcessor() {
     val results = mutableListOf<String>()
     override fun toResult(): List<String> {
         return results
@@ -15,7 +15,7 @@ open class AProcessor : AbstractTestProcessor() {
     @OptIn(KspExperimental::class)
     override fun process(resolver: Resolver): List<KSAnnotated> {
         resolver.getClassDeclarationByName("BaseClass")!!.let { cls ->
-            println(cls.getDeclaredProperties().map { "${it.simpleName.asString()}(${it.hasBackingField})" }.toList())
+            results.addAll(cls.getDeclaredProperties().map { "${it.simpleName.asString()}(${it.hasBackingField})" })
         }
         return emptyList()
     }

diff --git a/...ogle/devtools/ksp/processor/BProcessor.kt → ...tools/ksp/processor/ObjCacheBProcessor.kt b/...ogle/devtools/ksp/processor/BProcessor.kt → ...tools/ksp/processor/ObjCacheBProcessor.kt
@@ -6,7 +6,7 @@ import com.google.devtools.ksp.getDeclaredProperties
 import com.google.devtools.ksp.processing.Resolver
 import com.google.devtools.ksp.symbol.KSAnnotated
 
-open class BProcessor : AbstractTestProcessor() {
+open class ObjCacheBProcessor : AbstractTestProcessor() {
     val results = mutableListOf<String>()
     override fun toResult(): List<String> {
         return results
@@ -15,8 +15,7 @@ open class BProcessor : AbstractTestProcessor() {
     @OptIn(KspExperimental::class)
     override fun process(resolver: Resolver): List<KSAnnotated> {
         resolver.getClassDeclarationByName("BaseClass")!!.let { cls ->
-            println(cls.getDeclaredProperties().map { "${it.simpleName.asString()}(${it.hasBackingField})" }.toList())
-            // `hasBackingField` is true when running the test individually but is false when running the whole KSPAATest.
+            results.addAll(cls.getDeclaredProperties().map { "${it.simpleName.asString()}(${it.hasBackingField})" })
         }
         return emptyList()
     }

diff --git a/test-utils/testData/api/A.kt → test-utils/testData/api/objCacheA.kt b/test-utils/testData/api/A.kt → test-utils/testData/api/objCacheA.kt
@@ -16,8 +16,9 @@
  */
 
 // WITH_RUNTIME
-// TEST PROCESSOR: AProcessor
+// TEST PROCESSOR: ObjCacheAProcessor
 // EXPECTED:
+// genericProp(true)
 // END
 // MODULE: lib
 // FILE: Test.kt

diff --git a/test-utils/testData/api/B.kt → test-utils/testData/api/objCacheB.kt b/test-utils/testData/api/B.kt → test-utils/testData/api/objCacheB.kt
@@ -16,8 +16,9 @@
  */
 
 // WITH_RUNTIME
-// TEST PROCESSOR: BProcessor
+// TEST PROCESSOR: ObjCacheBProcessor
 // EXPECTED:
+// value(true)
 // END
 // MODULE: lib
 // FILE: Test.kt