From fba50a8d1537842315db69229117a48b78e9e555 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 4 Dec 2017 18:35:05 +0300 Subject: [PATCH] Disable language injection for SpEL language as it cause to many troubles It's known that there're several inspections that report warnings when SpEL language is injected not to Java files if IDEA is before 173. --- .../jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/idea/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt b/idea/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt index ed6a682eac9..840b5fa0708 100644 --- a/idea/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt +++ b/idea/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt @@ -319,6 +319,10 @@ class KotlinLanguageInjector( (argument.reference ?: argument.getArgumentName()?.referenceExpression?.mainReference) ?.let { it.resolve() as? PsiMethod } ?.let { findInjection(it, Configuration.getInstance().getInjections(JavaLanguageInjectionSupport.JAVA_SUPPORT_ID)) } + ?.takeIf { injectionInfo -> + // Temporary forbid injection for SpEL because of inspections that gives warnings when host language is not Java. + injectionInfo.languageId != "SpEL" + } } else -> null }