Fix REPL completion for import directives

This commit is contained in:
Ilya Muradyan
2020-07-09 05:41:50 +03:00
parent 16aee6c8d6
commit 2487f9369c
2 changed files with 16 additions and 4 deletions
@@ -322,6 +322,20 @@ class ReplCompletionAndErrorsAnalysisTest : TestCase() {
run(setupDefaultImportsCompletionRun)
}
@Test
fun testImportCompletion() = test {
run {
code = """
import kotl
""".trimIndent()
cursor = 11
expect {
completions.mode = ComparisonType.INCLUDES
addCompletion("kotlin", "kotlin", "package kotlin", "package")
}
}
}
@Ignore("Should be fixed by KT-39314")
@Test
fun ignore_testDefaultImportsNotFirst() = test {
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.analyzer.ModuleInfo
import org.jetbrains.kotlin.analyzer.ResolverForProject
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.container.ComponentProvider
import org.jetbrains.kotlin.container.getService
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
@@ -35,10 +36,7 @@ class KotlinResolutionFacadeForRepl(
throw UnsupportedOperationException()
}
override val moduleDescriptor: ModuleDescriptor
get() {
throw UnsupportedOperationException()
}
override val moduleDescriptor: ModuleDescriptor = provider.getService(ModuleDescriptor::class.java)
override fun <T : Any> getFrontendService(serviceClass: Class<T>): T {
return provider.resolve(serviceClass)!!.getValue() as T