From 0191c8c6c101099a5611233ab024a3281603c044 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 16 May 2017 15:16:46 +0300
Subject: [PATCH] Force kotlin injector before temporary injector (KT-6610)

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
---
 idea/src/META-INF/injection.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idea/src/META-INF/injection.xml b/idea/src/META-INF/injection.xml
index d263fdd79b7..b8186786aa2 100644
--- a/idea/src/META-INF/injection.xml
+++ b/idea/src/META-INF/injection.xml
@@ -1,6 +1,6 @@
 <idea-plugin>
     <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"
                             implementationClass="com.intellij.psi.impl.JavaRegExpHost"/>