azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finally turned on non-imported extensions completion optimization as new ResolutionFacade now allows for resolving any declaration

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-21 22:44:36 +03:00
parent 4e4fbfcabc
commit 07f7a35bc9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt
+4 -4
View File
@@ -36,6 +36,7 @@ import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo
import com.intellij.psi.stubs.StringStubIndexExtension import com.intellij.psi.stubs.StringStubIndexExtension
import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade
import org.jetbrains.jet.plugin.util.extensionsUtils.isExtensionCallable import org.jetbrains.jet.plugin.util.extensionsUtils.isExtensionCallable
import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade
public class KotlinIndicesHelper( public class KotlinIndicesHelper(
private val project: Project, private val project: Project,
@@ -199,13 +200,12 @@ public class KotlinIndicesHelper(
module: ModuleDescriptor, module: ModuleDescriptor,
bindingContext: BindingContext): Collection<CallableDescriptor> { bindingContext: BindingContext): Collection<CallableDescriptor> {
val fqnString = callableFQN.asString() val fqnString = callableFQN.asString()
val descriptors = /* this code is temporarily disabled because taking descriptors from another resolve session causes duplicates and potentially other problems*/ val descriptors = if (index != null) {
/*if (index != null) {
index.get(fqnString, project, scope) index.get(fqnString, project, scope)
.filter { it.getReceiverTypeReference() != null } .filter { it.getReceiverTypeReference() != null }
.map { it.getLazyResolveSession().resolveToDescriptor(it) as CallableDescriptor } .map { resolutionFacade.resolveToDescriptor(it) as CallableDescriptor }
} }
else*/ run { else {
val importDirective = JetPsiFactory(project).createImportDirective(fqnString) val importDirective = JetPsiFactory(project).createImportDirective(fqnString)
analyzeImportReference(importDirective, resolutionScope, BindingTraceContext(), module) analyzeImportReference(importDirective, resolutionScope, BindingTraceContext(), module)
.filterIsInstance(javaClass<CallableDescriptor>()) .filterIsInstance(javaClass<CallableDescriptor>())