From 639cc69920e6b81f1f255da960e0b4134a2c4593 Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <vladimir.dolzhenko@jetbrains.com>
Date: Fri, 24 Apr 2020 16:15:06 +0200
Subject: [PATCH] Reworked deprecated defaultLiveTemplatesProvider EP usage

Relates to #KT-38571
---
 .../kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java  | 1 +
 idea/resources/META-INF/plugin-common.xml                       | 2 +-
 idea/resources/META-INF/plugin.xml                              | 2 ++
 idea/resources/META-INF/plugin.xml.191                          | 1 +
 idea/resources/META-INF/plugin.xml.192                          | 2 ++
 idea/resources/META-INF/plugin.xml.201                          | 2 ++
 idea/resources/META-INF/plugin.xml.as35                         | 2 ++
 idea/resources/META-INF/plugin.xml.as36                         | 2 ++
 idea/resources/META-INF/plugin.xml.as40                         | 2 ++
 9 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java
index 39b6c0a974b..3f36b680d56 100644
--- a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java
+++ b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.idea.liveTemplates;
 
 import com.intellij.codeInsight.template.impl.DefaultLiveTemplatesProvider;
 
+// BUNCH: 193
 public class KotlinLiveTemplatesProvider implements DefaultLiveTemplatesProvider {
     @Override
     public String[] getDefaultLiveTemplateFiles() {
diff --git a/idea/resources/META-INF/plugin-common.xml b/idea/resources/META-INF/plugin-common.xml
index e101170edd2..54dc24a124d 100644
--- a/idea/resources/META-INF/plugin-common.xml
+++ b/idea/resources/META-INF/plugin-common.xml
@@ -522,7 +522,7 @@
     <liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType$Expression"/>
     <liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType$Comment"/>
     <liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType$ObjectDeclaration"/>
-    <defaultLiveTemplatesProvider implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinLiveTemplatesProvider"/>
+
     <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.AnyVariableMacro"/>
     <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.SuitableVariableMacro"/>
     <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.FunctionParametersMacro"/>
diff --git a/idea/resources/META-INF/plugin.xml b/idea/resources/META-INF/plugin.xml
index 67ec89742f9..f19fac7214b 100644
--- a/idea/resources/META-INF/plugin.xml
+++ b/idea/resources/META-INF/plugin.xml
@@ -118,5 +118,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
     <completion.ml.model implementation="org.jetbrains.kotlin.idea.completion.ml.KotlinMLRankingProvider"/>
     <completion.ml.contextFeatures language="kotlin" implementationClass="org.jetbrains.kotlin.idea.completion.ml.KotlinContextFeatureProvider"/>
+
+    <defaultLiveTemplatesProvider implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinLiveTemplatesProvider"/>
   </extensions>
 </idea-plugin>
diff --git a/idea/resources/META-INF/plugin.xml.191 b/idea/resources/META-INF/plugin.xml.191
index 391f698ad75..71ac6cb5c20 100644
--- a/idea/resources/META-INF/plugin.xml.191
+++ b/idea/resources/META-INF/plugin.xml.191
@@ -130,5 +130,6 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
       <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.formatter.KotlinFormatterUsageCollector"/>
       <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.statistics.ProjectConfigurationCollector"/>
 
+      <defaultLiveTemplatesProvider implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinLiveTemplatesProvider"/>
     </extensions>
 </idea-plugin>
diff --git a/idea/resources/META-INF/plugin.xml.192 b/idea/resources/META-INF/plugin.xml.192
index 1e6afdd6c2f..95b13a3b5ba 100644
--- a/idea/resources/META-INF/plugin.xml.192
+++ b/idea/resources/META-INF/plugin.xml.192
@@ -131,6 +131,8 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
       <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.statistics.ProjectConfigurationCollector"/>
 
       <fileTypeUsageSchemaDescriptor schema="Gradle Script" implementationClass="org.jetbrains.kotlin.idea.core.script.KotlinGradleScriptFileTypeSchemaDetector"/>
+
+      <defaultLiveTemplatesProvider implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinLiveTemplatesProvider"/>
     </extensions>
 
   <extensions defaultExtensionNs="com.intellij">
diff --git a/idea/resources/META-INF/plugin.xml.201 b/idea/resources/META-INF/plugin.xml.201
index 74c27467850..673e13d4c42 100644
--- a/idea/resources/META-INF/plugin.xml.201
+++ b/idea/resources/META-INF/plugin.xml.201
@@ -118,5 +118,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
     <refactoring.moveInnerHandler language="kotlin"
                                   implementationClass="org.jetbrains.kotlin.idea.refactoring.move.MoveKotlinInnerHandler"/>
+
+    <defaultLiveTemplates file="liveTemplates/Kotlin.xml"/>
   </extensions>
 </idea-plugin>
diff --git a/idea/resources/META-INF/plugin.xml.as35 b/idea/resources/META-INF/plugin.xml.as35
index f4cdead2fa9..95beda9e6d0 100644
--- a/idea/resources/META-INF/plugin.xml.as35
+++ b/idea/resources/META-INF/plugin.xml.as35
@@ -119,5 +119,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <extensions defaultExtensionNs="com.intellij">
     <fileTypeUsageSchemaDescriptor schema="Gradle Script" implementationClass="org.jetbrains.kotlin.idea.core.script.KotlinGradleScriptFileTypeSchemaDetector"/>
+
+    <defaultLiveTemplatesProvider implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinLiveTemplatesProvider"/>
   </extensions>
 </idea-plugin>
diff --git a/idea/resources/META-INF/plugin.xml.as36 b/idea/resources/META-INF/plugin.xml.as36
index 09cbfae4256..4bbf0d77287 100644
--- a/idea/resources/META-INF/plugin.xml.as36
+++ b/idea/resources/META-INF/plugin.xml.as36
@@ -119,5 +119,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <extensions defaultExtensionNs="com.intellij">
     <fileTypeUsageSchemaDescriptor schema="Gradle Script" implementationClass="org.jetbrains.kotlin.idea.core.script.KotlinGradleScriptFileTypeSchemaDetector"/>
+
+    <defaultLiveTemplatesProvider implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinLiveTemplatesProvider"/>
   </extensions>
 </idea-plugin>
diff --git a/idea/resources/META-INF/plugin.xml.as40 b/idea/resources/META-INF/plugin.xml.as40
index e8bb0fd437d..790085d566f 100644
--- a/idea/resources/META-INF/plugin.xml.as40
+++ b/idea/resources/META-INF/plugin.xml.as40
@@ -98,6 +98,8 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
     <fileTypeUsageSchemaDescriptor schema="Gradle Script" implementationClass="org.jetbrains.kotlin.idea.core.script.KotlinGradleScriptFileTypeSchemaDetector"/>
     <completion.ml.model implementation="org.jetbrains.kotlin.idea.completion.ml.KotlinMLRankingProvider"/>
+
+    <defaultLiveTemplatesProvider implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinLiveTemplatesProvider"/>
   </extensions>
 
   <extensions defaultExtensionNs="org.jetbrains.kotlin">