From ae22bdee150b993b2688b507db4394302898b580 Mon Sep 17 00:00:00 2001
From: Natalia Selezneva <natalia.selezneva@jetbrains.com>
Date: Tue, 26 Feb 2019 14:48:01 +0300
Subject: [PATCH] Add scripting resolver extension to
 plugin-kotlin-extensions.xml

---
 idea/resources/META-INF/plugin-kotlin-extensions.xml | 2 ++
 idea/resources/META-INF/plugin.xml                   | 4 ----
 idea/resources/META-INF/plugin.xml.182               | 4 ----
 idea/resources/META-INF/plugin.xml.191               | 4 ----
 idea/resources/META-INF/plugin.xml.as32              | 4 ----
 idea/resources/META-INF/plugin.xml.as33              | 4 ----
 idea/resources/META-INF/plugin.xml.as34              | 4 ----
 idea/resources/META-INF/plugin.xml.as35              | 4 ----
 8 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/idea/resources/META-INF/plugin-kotlin-extensions.xml b/idea/resources/META-INF/plugin-kotlin-extensions.xml
index 22de41a8173..a7f774bb4a5 100644
--- a/idea/resources/META-INF/plugin-kotlin-extensions.xml
+++ b/idea/resources/META-INF/plugin-kotlin-extensions.xml
@@ -28,5 +28,7 @@
     <idePlatformKind implementation="org.jetbrains.kotlin.platform.impl.CommonIdePlatformKind"/>
 
     <idePlatformKindTooling implementation="org.jetbrains.kotlin.idea.core.platform.impl.CommonIdePlatformKindTooling"/>
+
+    <syntheticResolveExtension implementation="org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingResolveExtension"/>
   </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/idea/resources/META-INF/plugin.xml b/idea/resources/META-INF/plugin.xml
index f53ffad3126..1f62b087db2 100644
--- a/idea/resources/META-INF/plugin.xml
+++ b/idea/resources/META-INF/plugin.xml
@@ -64,10 +64,6 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <xi:include href="plugin-kotlin-extensions.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
-  <extensions defaultExtensionNs="org.jetbrains.kotlin">
-    <syntheticResolveExtension implementation="org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingResolveExtension"/>
-  </extensions>
-
   <extensions defaultExtensionNs="com.intellij.jvm">
     <declarationSearcher language="kotlin" implementationClass="org.jetbrains.kotlin.idea.jvm.KotlinDeclarationSearcher"/>
   </extensions>
diff --git a/idea/resources/META-INF/plugin.xml.182 b/idea/resources/META-INF/plugin.xml.182
index fe5e2c234bf..82fcab1eeeb 100644
--- a/idea/resources/META-INF/plugin.xml.182
+++ b/idea/resources/META-INF/plugin.xml.182
@@ -71,10 +71,6 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <xi:include href="plugin-kotlin-extensions.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
-  <extensions defaultExtensionNs="org.jetbrains.kotlin">
-    <syntheticResolveExtension implementation="org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingResolveExtension"/>
-  </extensions>
-
   <extensions defaultExtensionNs="com.intellij.jvm">
     <declarationSearcher language="kotlin" implementationClass="org.jetbrains.kotlin.idea.jvm.KotlinDeclarationSearcher"/>
   </extensions>
diff --git a/idea/resources/META-INF/plugin.xml.191 b/idea/resources/META-INF/plugin.xml.191
index 18b5c7c6bc5..8ba8180a853 100644
--- a/idea/resources/META-INF/plugin.xml.191
+++ b/idea/resources/META-INF/plugin.xml.191
@@ -63,10 +63,6 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <xi:include href="plugin-kotlin-extensions.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
-  <extensions defaultExtensionNs="org.jetbrains.kotlin">
-    <syntheticResolveExtension implementation="org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingResolveExtension"/>
-  </extensions>
-
   <extensions defaultExtensionNs="com.intellij.jvm">
     <declarationSearcher language="kotlin" implementationClass="org.jetbrains.kotlin.idea.jvm.KotlinDeclarationSearcher"/>
   </extensions>
diff --git a/idea/resources/META-INF/plugin.xml.as32 b/idea/resources/META-INF/plugin.xml.as32
index dd057a511d1..b0a7b2e3c4b 100644
--- a/idea/resources/META-INF/plugin.xml.as32
+++ b/idea/resources/META-INF/plugin.xml.as32
@@ -70,10 +70,6 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <xi:include href="plugin-kotlin-extensions.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
-  <extensions defaultExtensionNs="org.jetbrains.kotlin">
-    <syntheticResolveExtension implementation="org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingResolveExtension"/>
-  </extensions>
-
   <extensions defaultExtensionNs="org.jetbrains.kotlin">
     <pluginUpdateVerifier implementation="org.jetbrains.kotlin.idea.update.GooglePluginUpdateVerifier"/>
   </extensions>
diff --git a/idea/resources/META-INF/plugin.xml.as33 b/idea/resources/META-INF/plugin.xml.as33
index b8f96c93d5e..38628b1d8d0 100644
--- a/idea/resources/META-INF/plugin.xml.as33
+++ b/idea/resources/META-INF/plugin.xml.as33
@@ -71,10 +71,6 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <xi:include href="plugin-kotlin-extensions.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
-  <extensions defaultExtensionNs="org.jetbrains.kotlin">
-    <syntheticResolveExtension implementation="org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingResolveExtension"/>
-  </extensions>
-
   <extensions defaultExtensionNs="org.jetbrains.kotlin">
     <pluginUpdateVerifier implementation="org.jetbrains.kotlin.idea.update.GooglePluginUpdateVerifier"/>
   </extensions>
diff --git a/idea/resources/META-INF/plugin.xml.as34 b/idea/resources/META-INF/plugin.xml.as34
index 7ec4ddcb0a1..7940be45b38 100644
--- a/idea/resources/META-INF/plugin.xml.as34
+++ b/idea/resources/META-INF/plugin.xml.as34
@@ -64,10 +64,6 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <xi:include href="plugin-kotlin-extensions.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
-  <extensions defaultExtensionNs="org.jetbrains.kotlin">
-    <syntheticResolveExtension implementation="org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingResolveExtension"/>
-  </extensions>
-
   <extensions defaultExtensionNs="org.jetbrains.kotlin">
     <pluginUpdateVerifier implementation="org.jetbrains.kotlin.idea.update.GooglePluginUpdateVerifier"/>
   </extensions>
diff --git a/idea/resources/META-INF/plugin.xml.as35 b/idea/resources/META-INF/plugin.xml.as35
index 1398d9670f9..e71bcf9adc2 100644
--- a/idea/resources/META-INF/plugin.xml.as35
+++ b/idea/resources/META-INF/plugin.xml.as35
@@ -64,10 +64,6 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <xi:include href="plugin-kotlin-extensions.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
-  <extensions defaultExtensionNs="org.jetbrains.kotlin">
-    <syntheticResolveExtension implementation="org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingResolveExtension"/>
-  </extensions>
-
   <extensions defaultExtensionNs="org.jetbrains.kotlin">
     <pluginUpdateVerifier implementation="org.jetbrains.kotlin.idea.update.GooglePluginUpdateVerifier"/>
   </extensions>