diff --git a/Changelog.md b/Changelog.md index 22625fb5226..4225b838005 100644 --- a/Changelog.md +++ b/Changelog.md @@ -106,7 +106,6 @@ New features: - [KT-11098](https://youtrack.jetbrains.com/issue/KT-11098) Inspection on final classes/functions annotated with Spring @Configuration/@Component/@Bean - [KT-11405](https://youtrack.jetbrains.com/issue/KT-11405) Navigation and Find Usages for Spring beans referenced in annotation arguments and BeanFactory method calls - [KT-3741](https://youtrack.jetbrains.com/issue/KT-3741) Show Spring-specific line markers on Kotlin classes -- [KT-11406](https://youtrack.jetbrains.com/issue/KT-11406) Support Spring EL injections inside of Kotlin string literals General issues fixed: diff --git a/idea/idea-ultimate/src/META-INF/kotlin-spring.xml b/idea/idea-ultimate/src/META-INF/kotlin-spring.xml index 12b5f6831cf..347c6c334ca 100644 --- a/idea/idea-ultimate/src/META-INF/kotlin-spring.xml +++ b/idea/idea-ultimate/src/META-INF/kotlin-spring.xml @@ -2,8 +2,6 @@ - - host.putUserData(ELContextProvider.ourContextProviderKey, SpringElContextProvider(host)) } - } - } - - override fun getLanguagesToInject(registrar: MultiHostRegistrar, host: PsiElement) { - if (host is KtStringTemplateExpression) { - if (!host.isPlain()) return - - val argument = host.parent as? KtValueArgument ?: return - val argumentName = argument.getArgumentName() - if (argumentName != null && argumentName.asName.asString() != "value") return - - val entry = argument.getStrictParentOfType() ?: return - val context = entry.analyze(BodyResolveMode.PARTIAL) - val resolvedCall = entry.getResolvedCall(context) ?: return - val annotation = (resolvedCall.resultingDescriptor as? ConstructorDescriptor)?.containingDeclaration ?: return - if (annotation.importableFqName?.asString() !in RELEVANT_ANNOTATIONS) return - - val text = host.getText() - val ranges = SpringElTemplateParser.parse(text).ifEmpty { return } - for (range in ranges) { - registrar - .startInjecting(SpringELLanguage.INSTANCE) - .addPlace(null, null, host as PsiLanguageInjectionHost, range) - .doneInjecting() - } - - contextRecorder!!(host) - } - } - - override fun elementsToInjectIn() = contextRecorder?.let { listOf(KtStringTemplateExpression::class.java) } ?: emptyList() -} -