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

Force kotlin injector before temporary injector (KT-6610)

Browse Source 
Place KotlinLanguageInject before TemporaryPlacesInjector

TemporaryPlacesInjector injects languages as a single place while we
need to distinguish interpolated and non-interpolated strings. Bad
ordering leads to inconsistent behaviour in temporary injection and
injection with annotations and comments.

See InjectedLanguageManagerImpl.getInjectorMap()

 #KT-6610 In Progress
This commit is contained in:
Nikolay Krasko
2017-05-16 15:16:46 +03:00
parent 2f1a40a40d
commit 0191c8c6c1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/injection.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<idea-plugin> <idea-plugin>
<extensions defaultExtensionNs="com.intellij"> <extensions defaultExtensionNs="com.intellij">
<multiHostInjector implementation="org.jetbrains.kotlin.idea.injection.KotlinLanguageInjector"/> <multiHostInjector implementation="org.jetbrains.kotlin.idea.injection.KotlinLanguageInjector" order="first,before TemporaryPlacesInjector"/>
<regExpLanguageHost forClass="org.jetbrains.kotlin.psi.KtStringTemplateExpression" <regExpLanguageHost forClass="org.jetbrains.kotlin.psi.KtStringTemplateExpression"
implementationClass="com.intellij.psi.impl.JavaRegExpHost"/> implementationClass="com.intellij.psi.impl.JavaRegExpHost"/>