aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTing-Yuan Huang <laszio@google.com>2024-05-04 22:00:44 -0700
committerlaszio <ting-yuan@users.noreply.github.com>2024-05-07 10:44:08 -0700
commit2338e70cfa6868aa9ae33dc0364a219be98adae5 (patch)
treea70f4048e85a474ff46086f29a7edbf8ced85e0e
parent6b8a9ed1e0dfe92bfb2ab1386ea2f9b9a58c74ee (diff)
downloadksp-2338e70cfa6868aa9ae33dc0364a219be98adae5.tar.gz
Do not index classpath in declaration provider
It was a workaround where symbol provider depended on declaration provider. It is no longer needed after KT-66689 was fixed.
-rw-r--r--kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt7
-rw-r--r--kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalKotlinDeclarationProvider.kt7
2 files changed, 3 insertions, 11 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
index 85569f32..74c23360 100644
--- 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
@@ -370,12 +370,7 @@ class KotlinSymbolProcessing(
project.getService(
KotlinDeclarationProviderFactory::class.java
) as IncrementalKotlinDeclarationProviderFactory
- )
- .update(
- ktFiles,
- StandaloneProjectFactory.getAllBinaryRoots(modules, kotlinCoreProjectEnvironment).map { it.file } +
- listOfNotNull(VirtualFileManager.getInstance().findFileByNioPath(kspConfig.classOutputDir.toPath()))
- )
+ ).update(ktFiles)
(
project.getService(
KotlinPackageProviderFactory::class.java
diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalKotlinDeclarationProvider.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalKotlinDeclarationProvider.kt
index 74caa114..005209fa 100644
--- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalKotlinDeclarationProvider.kt
+++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalKotlinDeclarationProvider.kt
@@ -1,7 +1,6 @@
package com.google.devtools.ksp.standalone
import com.intellij.openapi.project.Project
-import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.analysis.project.structure.KtModule
import org.jetbrains.kotlin.analysis.providers.KotlinDeclarationProvider
@@ -94,11 +93,9 @@ class IncrementalKotlinDeclarationProviderFactory(
}
}
- fun update(files: Collection<KtFile>, moduleRoots: List<VirtualFile>) {
+ fun update(files: Collection<KtFile>) {
this.files = files
- this.staticFactory = KotlinStaticDeclarationProviderFactory(
- project, files, sharedBinaryRoots = moduleRoots, shouldBuildStubsForBinaryLibraries = true
- )
+ this.staticFactory = KotlinStaticDeclarationProviderFactory(project, files)
provider?.let {
it.del = createDelegateProvider()
}