Fix REPL completion for import directives
This commit is contained in:
+14
@@ -322,6 +322,20 @@ class ReplCompletionAndErrorsAnalysisTest : TestCase() {
|
|||||||
run(setupDefaultImportsCompletionRun)
|
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")
|
@Ignore("Should be fixed by KT-39314")
|
||||||
@Test
|
@Test
|
||||||
fun ignore_testDefaultImportsNotFirst() = test {
|
fun ignore_testDefaultImportsNotFirst() = test {
|
||||||
|
|||||||
+2
-4
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.analyzer.ModuleInfo
|
|||||||
import org.jetbrains.kotlin.analyzer.ResolverForProject
|
import org.jetbrains.kotlin.analyzer.ResolverForProject
|
||||||
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
|
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
|
||||||
import org.jetbrains.kotlin.container.ComponentProvider
|
import org.jetbrains.kotlin.container.ComponentProvider
|
||||||
|
import org.jetbrains.kotlin.container.getService
|
||||||
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
||||||
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
|
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
|
||||||
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
|
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
|
||||||
@@ -35,10 +36,7 @@ class KotlinResolutionFacadeForRepl(
|
|||||||
throw UnsupportedOperationException()
|
throw UnsupportedOperationException()
|
||||||
}
|
}
|
||||||
|
|
||||||
override val moduleDescriptor: ModuleDescriptor
|
override val moduleDescriptor: ModuleDescriptor = provider.getService(ModuleDescriptor::class.java)
|
||||||
get() {
|
|
||||||
throw UnsupportedOperationException()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun <T : Any> getFrontendService(serviceClass: Class<T>): T {
|
override fun <T : Any> getFrontendService(serviceClass: Class<T>): T {
|
||||||
return provider.resolve(serviceClass)!!.getValue() as T
|
return provider.resolve(serviceClass)!!.getValue() as T
|
||||||
|
|||||||
Reference in New Issue
Block a user