Skip to content

Commit 34e241d

Browse files
ting-yuanKSP Auto Pick
authored and
KSP Auto Pick
committed
Incremental: fix roots from getSealedSubclasses
by just including the files that contain the sealed class / interface. Their subclasses will be invalidated during dirtiness propagation. (cherry picked from commit e593074)
1 parent 27f57e8 commit 34e241d

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

common-util/src/main/kotlin/com/google/devtools/ksp/common/IncrementalContextBase.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,7 @@ abstract class IncrementalContextBase(
234234
symbolLookupCache.get(it).map { File(it) }
235235
}
236236

237-
val dirtyFilesBySealed = sealedMap.keys.flatMap { sealedMap[it]!! }.flatMap {
238-
symbolLookupCache.get(it).map { File(it) }
239-
}
237+
val dirtyFilesBySealed = sealedMap.keys
240238

241239
// Calculate dirty files by dirty classes in CP.
242240
val dirtyFilesByCP = changedClasses.flatMap { fqn ->

integration-tests/src/test/kotlin/com/google/devtools/ksp/test/GetSealedSubclassesIncIT.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.google.devtools.ksp.test
22

33
import org.gradle.testkit.runner.GradleRunner
44
import org.junit.Assert
5-
import org.junit.Assume
65
import org.junit.Rule
76
import org.junit.Test
87
import org.junit.runner.RunWith
@@ -17,7 +16,6 @@ class GetSealedSubclassesIncIT(val useKSP2: Boolean) {
1716

1817
@Test
1918
fun testGetSealedSubclassesInc() {
20-
Assume.assumeFalse(useKSP2)
2119
val gradleRunner = GradleRunner.create().withProjectDir(project.root)
2220

2321
val expected2 = listOf(

0 commit comments

Comments
 (0)