From 6342bc378e8d368d07fae1577fe156b12168e21c Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Fri, 9 Nov 2018 17:17:12 +0300 Subject: [PATCH] KotlinLanguageInjector: removing `kotlin.annotation.injection.enabled` key --- .../kotlin/idea/injection/KotlinLanguageInjector.kt | 4 ---- .../kotlin/idea/injection/KotlinLanguageInjector.kt.173 | 4 ---- idea/tests/org/jetbrains/kotlin/psi/KotlinInjectionTest.kt | 7 ------- 3 files changed, 15 deletions(-) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt index 55d43cfe353..6b31122b136 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt @@ -23,7 +23,6 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.progress.ProgressManager import com.intellij.openapi.project.Project import com.intellij.openapi.util.Key -import com.intellij.openapi.util.registry.Registry import com.intellij.openapi.util.text.StringUtilRt import com.intellij.patterns.PatternCondition import com.intellij.patterns.PatternConditionPlus @@ -75,8 +74,6 @@ class KotlinLanguageInjector( private val ABSENT_KOTLIN_INJECTION = BaseInjection("ABSENT_KOTLIN_BASE_INJECTION") } - var annotationInjectionsEnabled = Registry.`is`("kotlin.annotation.injection.enabled", false) - private val kotlinSupport: KotlinLanguageInjectionSupport? by lazy { ArrayList(InjectorUtils.getActiveInjectionSupports()).filterIsInstance(KotlinLanguageInjectionSupport::class.java).firstOrNull() } @@ -310,7 +307,6 @@ class KotlinLanguageInjector( } private fun injectInAnnotationCall(host: KtElement): InjectionInfo? { - if (!annotationInjectionsEnabled) return null val argument = host.parent as? KtValueArgument ?: return null val annotationEntry = argument.parent.parent as? KtCallElement ?: return null if (!fastCheckInjectionsExists(annotationEntry)) return null diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt.173 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt.173 index 6e8ff8a48f7..5b4834bceba 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt.173 +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt.173 @@ -23,7 +23,6 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.progress.ProgressManager import com.intellij.openapi.project.Project import com.intellij.openapi.util.Key -import com.intellij.openapi.util.registry.Registry import com.intellij.openapi.util.text.StringUtilRt import com.intellij.patterns.PatternCondition import com.intellij.patterns.PatternConditionPlus @@ -75,8 +74,6 @@ class KotlinLanguageInjector( private val ABSENT_KOTLIN_INJECTION = BaseInjection("ABSENT_KOTLIN_BASE_INJECTION") } - var annotationInjectionsEnabled = Registry.`is`("kotlin.annotation.injection.enabled", false) - private val kotlinSupport: KotlinLanguageInjectionSupport? by lazy { ArrayList(InjectorUtils.getActiveInjectionSupports()).filterIsInstance(KotlinLanguageInjectionSupport::class.java).firstOrNull() } @@ -306,7 +303,6 @@ class KotlinLanguageInjector( } private fun injectInAnnotationCall(host: KtElement): InjectionInfo? { - if (!annotationInjectionsEnabled) return null val argument = host.parent as? KtValueArgument ?: return null val annotationEntry = argument.parent.parent as? KtCallElement ?: return null if (!fastCheckInjectionsExists(annotationEntry)) return null diff --git a/idea/tests/org/jetbrains/kotlin/psi/KotlinInjectionTest.kt b/idea/tests/org/jetbrains/kotlin/psi/KotlinInjectionTest.kt index 35ae7f95ce9..3b9b6124593 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/KotlinInjectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/KotlinInjectionTest.kt @@ -18,15 +18,12 @@ package org.jetbrains.kotlin.psi import com.intellij.codeInsight.completion.CompletionType import com.intellij.lang.html.HTMLLanguage -import com.intellij.lang.injection.MultiHostInjector import com.intellij.openapi.fileTypes.PlainTextLanguage import org.intellij.lang.annotations.Language import org.intellij.lang.regexp.RegExpLanguage import org.intellij.plugins.intelliLang.Configuration import org.intellij.plugins.intelliLang.inject.config.BaseInjection import org.intellij.plugins.intelliLang.inject.config.InjectionPlace -import org.jetbrains.kotlin.idea.injection.KotlinLanguageInjector -import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance class KotlinInjectionTest : AbstractInjectionTest() { fun testInjectionOnJavaPredefinedMethodWithAnnotation() = doInjectionPresentTest( @@ -605,10 +602,7 @@ class KotlinInjectionTest : AbstractInjectionTest() { pattern, "temp rule") customInjection.setInjectionPlaces(InjectionPlace(elementPattern, true)) - val kotlinLanguageInjector = MultiHostInjector.MULTIHOST_INJECTOR_EP_NAME.getExtensions(project).firstIsInstance() - val injectionsEnabled = kotlinLanguageInjector.annotationInjectionsEnabled try { - kotlinLanguageInjector.annotationInjectionsEnabled = true Configuration.getInstance().replaceInjections(listOf(customInjection), listOf(), true) doInjectionPresentTest( @@ -619,7 +613,6 @@ class KotlinInjectionTest : AbstractInjectionTest() { additionalAsserts() } finally { - kotlinLanguageInjector.annotationInjectionsEnabled = injectionsEnabled Configuration.getInstance().replaceInjections(listOf(), listOf(customInjection), true) } }