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

KotlinLanguageInjector can inject into files modified for autocompletion

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2017-08-21 10:05:34 +03:00
committed by Nikolay Krasko
parent 1435911437
commit 81b6a61edf
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt
+1 -1
View File
@@ -75,7 +75,7 @@ class KotlinLanguageInjector(
val support = kotlinSupport ?: return val support = kotlinSupport ?: return
if (!ProjectRootsUtil.isInProjectOrLibSource(ktHost)) return if (!ProjectRootsUtil.isInProjectOrLibSource(ktHost.containingFile.originalFile)) return
val needImmediateAnswer = with(ApplicationManager.getApplication()) { isDispatchThread && !isUnitTestMode } val needImmediateAnswer = with(ApplicationManager.getApplication()) { isDispatchThread && !isUnitTestMode }
val kotlinCachedInjection = ktHost.cachedInjectionWithModification val kotlinCachedInjection = ktHost.cachedInjectionWithModification
idea/tests/org/jetbrains/kotlin/psi/KotlinInjectionTest.kt
+4
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.psi package org.jetbrains.kotlin.psi
import com.intellij.codeInsight.completion.CompletionType
import com.intellij.lang.html.HTMLLanguage import com.intellij.lang.html.HTMLLanguage
import com.intellij.openapi.fileTypes.PlainTextLanguage import com.intellij.openapi.fileTypes.PlainTextLanguage
import org.intellij.lang.regexp.RegExpLanguage import org.intellij.lang.regexp.RegExpLanguage
@@ -513,6 +514,9 @@ class KotlinInjectionTest : AbstractInjectionTest() {
HTMLLanguage.INSTANCE.id, HTMLLanguage.INSTANCE.id,
unInjectShouldBePresent = false unInjectShouldBePresent = false
) )
assertSameElements(myFixture.complete(CompletionType.BASIC).flatMap { it.allLookupStrings },
"html")
} }
finally { finally {
Configuration.getInstance().replaceInjections(listOf(), listOf(customInjection), true) Configuration.getInstance().replaceInjections(listOf(), listOf(customInjection), true)