From e59f6741c468f2b7967167fb02f76629d9cff474 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Wed, 22 Mar 2017 13:50:49 +0100
Subject: [PATCH] Move GradleScriptTemplatesProvider to the optional gradle
 part of "plugin.xml"

Fixes #KT-16649
---
 idea/src/META-INF/extensions/ide.xml | 4 ----
 idea/src/META-INF/gradle.xml         | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/idea/src/META-INF/extensions/ide.xml b/idea/src/META-INF/extensions/ide.xml
index c83f59a641a..907aca56000 100644
--- a/idea/src/META-INF/extensions/ide.xml
+++ b/idea/src/META-INF/extensions/ide.xml
@@ -15,10 +15,6 @@
         <!-- diagnosticSuppressor decelerated in common.xml -->
         <diagnosticSuppressor implementation="org.jetbrains.kotlin.idea.debugger.DiagnosticSuppressorForDebugger"/>
 
-        <scriptTemplatesProvider
-            id="GradleScriptTemplatesProvider"
-            implementation="org.jetbrains.kotlin.idea.core.script.GradleScriptTemplatesProvider"/>
-
         <scriptTemplatesProvider
             id="ScriptTemplatesFromCompilerSettingsProvider"
             implementation="org.jetbrains.kotlin.idea.script.ScriptTemplatesFromCompilerSettingsProvider"/>
diff --git a/idea/src/META-INF/gradle.xml b/idea/src/META-INF/gradle.xml
index f163df2d899..6ab3d85ac30 100644
--- a/idea/src/META-INF/gradle.xml
+++ b/idea/src/META-INF/gradle.xml
@@ -45,5 +45,9 @@
         <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJsGradleModuleConfigurator"/>
         <versionInfoProvider implementation="org.jetbrains.kotlin.idea.configuration.GradleKotlinVersionInfoProvider"/>
         <platformGradleDetector implementation="org.jetbrains.kotlin.idea.inspections.gradle.DefaultPlatformGradleDetector"/>
+
+        <scriptTemplatesProvider
+            id="GradleScriptTemplatesProvider"
+            implementation="org.jetbrains.kotlin.idea.core.script.GradleScriptTemplatesProvider"/>
     </extensions>
 </idea-plugin>