KotlinLanguageInjector can inject into files modified for autocompletion
This commit is contained in:
committed by
Nikolay Krasko
parent
1435911437
commit
81b6a61edf
@@ -75,7 +75,7 @@ class KotlinLanguageInjector(
|
||||
|
||||
val support = kotlinSupport ?: return
|
||||
|
||||
if (!ProjectRootsUtil.isInProjectOrLibSource(ktHost)) return
|
||||
if (!ProjectRootsUtil.isInProjectOrLibSource(ktHost.containingFile.originalFile)) return
|
||||
|
||||
val needImmediateAnswer = with(ApplicationManager.getApplication()) { isDispatchThread && !isUnitTestMode }
|
||||
val kotlinCachedInjection = ktHost.cachedInjectionWithModification
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
package org.jetbrains.kotlin.psi
|
||||
|
||||
import com.intellij.codeInsight.completion.CompletionType
|
||||
import com.intellij.lang.html.HTMLLanguage
|
||||
import com.intellij.openapi.fileTypes.PlainTextLanguage
|
||||
import org.intellij.lang.regexp.RegExpLanguage
|
||||
@@ -513,6 +514,9 @@ class KotlinInjectionTest : AbstractInjectionTest() {
|
||||
HTMLLanguage.INSTANCE.id,
|
||||
unInjectShouldBePresent = false
|
||||
)
|
||||
|
||||
assertSameElements(myFixture.complete(CompletionType.BASIC).flatMap { it.allLookupStrings },
|
||||
"html")
|
||||
}
|
||||
finally {
|
||||
Configuration.getInstance().replaceInjections(listOf(), listOf(customInjection), true)
|
||||
|
||||
Reference in New Issue
Block a user