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

FileScopeFactory: extra imports computed via virtual file as opposed to KtFile

Browse Source 
This fixes completion session acting as if there are no imports
This commit is contained in:
Pavel V. Talanov
2016-06-16 22:32:50 +03:00
parent e46fab5151
commit c3df743a28
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeFactory.kt
+4 -3
View File
@@ -28,7 +28,6 @@ import org.jetbrains.kotlin.resolve.BindingTrace
import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.resolve.ImportPath
import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver
import org.jetbrains.kotlin.resolve.TemporaryBindingTrace import org.jetbrains.kotlin.resolve.TemporaryBindingTrace
import org.jetbrains.kotlin.resolve.bindingContextUtil.recordScope
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.ImportingScope import org.jetbrains.kotlin.resolve.scopes.ImportingScope
import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.resolve.scopes.LexicalScope
@@ -73,8 +72,10 @@ class FileScopeFactory(
val explicitImportResolver = createImportResolver(ExplicitImportsIndexed(imports), bindingTrace) val explicitImportResolver = createImportResolver(ExplicitImportsIndexed(imports), bindingTrace)
val allUnderImportResolver = createImportResolver(AllUnderImportsIndexed(imports), bindingTrace) val allUnderImportResolver = createImportResolver(AllUnderImportsIndexed(imports), bindingTrace)
val extraImports = ktImportsFactory.createImportDirectives(getScriptExternalDependencies(file).flatMap { it.imports.map { ImportPath(it) } }) val extraImports = file.originalFile.virtualFile?.let { getScriptExternalDependencies(it, file.project) }
val allImplicitImports = defaultImports + extraImports ?.flatMap { ktImportsFactory.createImportDirectives(it.imports.map { ImportPath(it) }) }
val allImplicitImports = defaultImports + extraImports.orEmpty()
val defaultImportsFiltered = if (aliasImportNames.isEmpty()) { // optimization val defaultImportsFiltered = if (aliasImportNames.isEmpty()) { // optimization
allImplicitImports allImplicitImports