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

Respect source/test roots when building scope in CompletionSession

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-10-09 18:18:03 +04:00
parent 2ded7bae73
commit b6d76157c4
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt
+2 -4
View File
@@ -32,8 +32,7 @@ import org.jetbrains.jet.plugin.references.JetSimpleNameReference
import org.jetbrains.jet.plugin.project.ResolveSessionForBodies import org.jetbrains.jet.plugin.project.ResolveSessionForBodies
import org.jetbrains.jet.plugin.caches.KotlinIndicesHelper import org.jetbrains.jet.plugin.caches.KotlinIndicesHelper
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.module.ModuleUtilCore import org.jetbrains.jet.plugin.search.searchScopeForSourceElementDependencies
import com.intellij.openapi.module.Module
class CompletionSessionConfiguration( class CompletionSessionConfiguration(
val completeNonImportedDeclarations: Boolean, val completeNonImportedDeclarations: Boolean,
@@ -65,8 +64,7 @@ abstract class CompletionSessionBase(protected val configuration: CompletionSess
protected val project: Project = position.getProject() protected val project: Project = position.getProject()
protected val indicesHelper: KotlinIndicesHelper = KotlinIndicesHelper(project) protected val indicesHelper: KotlinIndicesHelper = KotlinIndicesHelper(project)
protected val module: Module? = ModuleUtilCore.findModuleForPsiElement(parameters.getOriginalFile()) protected val searchScope: GlobalSearchScope = searchScopeForSourceElementDependencies(parameters.getOriginalFile()) ?: GlobalSearchScope.EMPTY_SCOPE
protected val searchScope: GlobalSearchScope = if (module != null) GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module) else GlobalSearchScope.EMPTY_SCOPE
protected fun isVisibleDescriptor(descriptor: DeclarationDescriptor): Boolean { protected fun isVisibleDescriptor(descriptor: DeclarationDescriptor): Boolean {
if (configuration.completeNonAccessibleDeclarations) return true if (configuration.completeNonAccessibleDeclarations) return true