Skip to content

Commit 8357e83

Browse files
ting-yuanKSP Auto Pick
authored andcommitted
Dispose KotlinStandalonePackageProviderFactor via IncrementalKotlinPackageProviderFactory
(cherry picked from commit dc5ba2e)
1 parent cdfb36a commit 8357e83

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ class KotlinSymbolProcessing(
259259
kotlinCoreProjectEnvironment,
260260
ktFiles,
261261
createPackagePartProvider,
262-
projectDisposable
263262
)
264263

265264
CoreApplicationEnvironment.registerExtensionPoint(
@@ -296,7 +295,6 @@ class KotlinSymbolProcessing(
296295
kotlinCoreProjectEnvironment: KotlinCoreProjectEnvironment,
297296
ktFiles: List<KtFile>,
298297
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider,
299-
projectDisposable: Disposable,
300298
) {
301299
val project = kotlinCoreProjectEnvironment.project
302300
project.apply {
@@ -345,10 +343,7 @@ class KotlinSymbolProcessing(
345343
KotlinDeclarationProviderMerger::class.java,
346344
KotlinStandaloneDeclarationProviderMerger(this)
347345
)
348-
registerService(
349-
KotlinPackageProviderFactory::class.java,
350-
IncrementalKotlinPackageProviderFactory(project, projectDisposable)
351-
)
346+
registerService(KotlinPackageProviderFactory::class.java, IncrementalKotlinPackageProviderFactory(project))
352347

353348
registerService(
354349
SealedClassInheritorsProvider::class.java,

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ import org.jetbrains.kotlin.psi.KtFile
1212

1313
class IncrementalKotlinPackageProviderFactory(
1414
private val project: Project,
15-
private val projectDisposable: Disposable,
16-
) : KotlinPackageProviderFactory {
15+
) : KotlinPackageProviderFactory, Disposable {
1716
private val staticFactories: MutableList<KotlinStandalonePackageProviderFactory> = mutableListOf()
1817

1918
override fun createPackageProvider(searchScope: GlobalSearchScope): KotlinPackageProvider {
@@ -23,7 +22,10 @@ class IncrementalKotlinPackageProviderFactory(
2322

2423
fun update(files: Collection<KtFile>) {
2524
val staticFactory = KotlinStandalonePackageProviderFactory(project, files)
26-
Disposer.register(projectDisposable, staticFactory)
25+
Disposer.register(this, staticFactory)
2726
staticFactories.add(staticFactory)
2827
}
28+
29+
override fun dispose() {
30+
}
2931
}

0 commit comments

Comments
 (0)