Simplify initialization process for JavaClassFinderImpl
After this change, it's not required to call "initialize" with binding trace and KotlinCodeAnalyzer that is rather useful for FIR
This commit is contained in:
+7
-6
@@ -29,21 +29,22 @@ import javax.inject.Inject
|
||||
|
||||
abstract class AbstractJavaClassFinder : JavaClassFinder {
|
||||
|
||||
lateinit var project: Project
|
||||
@Inject set
|
||||
|
||||
protected lateinit var baseScope: GlobalSearchScope
|
||||
protected lateinit var project: Project
|
||||
protected lateinit var javaSearchScope: GlobalSearchScope
|
||||
|
||||
|
||||
@Inject
|
||||
fun setScope(scope: GlobalSearchScope) {
|
||||
this.baseScope = scope
|
||||
javaSearchScope = FilterOutKotlinSourceFilesScope(scope)
|
||||
}
|
||||
|
||||
@Inject
|
||||
open fun setProjectInstance(project: Project) {
|
||||
this.project = project
|
||||
}
|
||||
|
||||
@PostConstruct
|
||||
open fun initialize(trace: BindingTrace, codeAnalyzer: KotlinCodeAnalyzer) {
|
||||
javaSearchScope = FilterOutKotlinSourceFilesScope(baseScope)
|
||||
CodeAnalyzerInitializer.getInstance(project).initialize(trace, codeAnalyzer.moduleDescriptor, codeAnalyzer)
|
||||
}
|
||||
|
||||
|
||||
@@ -16,25 +16,27 @@
|
||||
|
||||
package org.jetbrains.kotlin.load.java
|
||||
|
||||
import com.intellij.openapi.project.Project
|
||||
import org.jetbrains.kotlin.load.java.structure.JavaClass
|
||||
import org.jetbrains.kotlin.load.java.structure.impl.JavaPackageImpl
|
||||
import org.jetbrains.kotlin.name.FqName
|
||||
import org.jetbrains.kotlin.resolve.BindingTrace
|
||||
import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade
|
||||
import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer
|
||||
import javax.inject.Inject
|
||||
|
||||
class JavaClassFinderImpl : AbstractJavaClassFinder() {
|
||||
|
||||
private lateinit var javaFacade: KotlinJavaPsiFacade
|
||||
|
||||
override fun initialize(trace: BindingTrace, codeAnalyzer: KotlinCodeAnalyzer) {
|
||||
@Inject
|
||||
override fun setProjectInstance(project: Project) {
|
||||
super.setProjectInstance(project)
|
||||
javaFacade = KotlinJavaPsiFacade.getInstance(project)
|
||||
super.initialize(trace, codeAnalyzer)
|
||||
}
|
||||
|
||||
override fun findClass(request: JavaClassFinder.Request): JavaClass? = javaFacade.findClass(request, javaSearchScope)
|
||||
|
||||
override fun findPackage(fqName: FqName) = javaFacade.findPackage(fqName.asString(), javaSearchScope)?.let { JavaPackageImpl(it, javaSearchScope) }
|
||||
override fun findPackage(fqName: FqName) =
|
||||
javaFacade.findPackage(fqName.asString(), javaSearchScope)?.let { JavaPackageImpl(it, javaSearchScope) }
|
||||
|
||||
override fun knownClassNamesInPackage(packageFqName: FqName): Set<String>? = javaFacade.knownClassNamesInPackage(packageFqName)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user