From b6d76157c4a76c009a74815acb5f0011fa1c7955 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 9 Oct 2014 18:18:03 +0400 Subject: [PATCH] Respect source/test roots when building scope in CompletionSession --- .../jetbrains/jet/plugin/completion/CompletionSession.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt index 1140bce0e8b..5b8a2456e80 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt @@ -32,8 +32,7 @@ import org.jetbrains.jet.plugin.references.JetSimpleNameReference import org.jetbrains.jet.plugin.project.ResolveSessionForBodies import org.jetbrains.jet.plugin.caches.KotlinIndicesHelper import com.intellij.openapi.project.Project -import com.intellij.openapi.module.ModuleUtilCore -import com.intellij.openapi.module.Module +import org.jetbrains.jet.plugin.search.searchScopeForSourceElementDependencies class CompletionSessionConfiguration( val completeNonImportedDeclarations: Boolean, @@ -65,8 +64,7 @@ abstract class CompletionSessionBase(protected val configuration: CompletionSess protected val project: Project = position.getProject() protected val indicesHelper: KotlinIndicesHelper = KotlinIndicesHelper(project) - protected val module: Module? = ModuleUtilCore.findModuleForPsiElement(parameters.getOriginalFile()) - protected val searchScope: GlobalSearchScope = if (module != null) GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module) else GlobalSearchScope.EMPTY_SCOPE + protected val searchScope: GlobalSearchScope = searchScopeForSourceElementDependencies(parameters.getOriginalFile()) ?: GlobalSearchScope.EMPTY_SCOPE protected fun isVisibleDescriptor(descriptor: DeclarationDescriptor): Boolean { if (configuration.completeNonAccessibleDeclarations) return true