From 46c8f5aa5667c91278655ceb4e3ba119af39c348 Mon Sep 17 00:00:00 2001
From: Piotr Tomiak <piotr.tomiak@jetbrains.com>
Date: Mon, 23 Dec 2019 18:47:26 +0100
Subject: [PATCH] Make DefaultLiveTemplate extension point dynamic - fixes.

GitOrigin-RevId: 9d8b2a093fe188b5b055fb5a7c3094dec781984e
---
 .../intellij/codeInsight/template/impl/TemplateSettings.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
index c3cffd4ff147..6a55daf75a8d 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
@@ -289,9 +289,7 @@ public final class TemplateSettings implements PersistentStateComponent<Template
     }, ApplicationManager.getApplication());
 
     DefaultLiveTemplateEP.EP_NAME.addExtensionPointListener((a,b) -> {
-      myDefaultTemplates.clear();
-      myTemplatesById.clear();
-      loadDefaultLiveTemplates();
+      mySchemeManager.reload();
     }, ApplicationManager.getApplication());
   }
 
@@ -487,6 +485,7 @@ public final class TemplateSettings implements PersistentStateComponent<Template
 
   private void loadDefaultLiveTemplates() {
     try {
+      myPredefinedTemplates.clear();
       for (DefaultLiveTemplatesProvider provider : DefaultLiveTemplatesProvider.EP_NAME.getExtensionList()) {
         loadDefaultLiveTemplatesFromProvider(provider);
       }