IDEA-137104 Code templates don't save their state

java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/DefaultFileTemplateUsageInspection.java

@@ -17,6 +17,7 @@ package com.intellij.codeInspection.defaultFileTemplateUsage;
 
 import com.intellij.codeInspection.*;
 import com.intellij.ide.fileTemplates.FileTemplate;
+import com.intellij.ide.fileTemplates.FileTemplateManager;
 import com.intellij.ide.fileTemplates.impl.FileTemplateConfigurable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.WriteCommandAction;
@@ -107,6 +108,7 @@ public class DefaultFileTemplateUsageInspection extends BaseJavaLocalInspectionT
             WriteCommandAction.runWriteCommandAction(project, new Runnable() {
               @Override
               public void run() {
+                FileTemplateManager.getInstance(project).saveAllTemplates();
                 myReplaceTemplateFix.applyFix(project, descriptor);
               }
             });

platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateManager.java

@@ -145,5 +145,6 @@ public abstract class FileTemplateManager{
   public abstract FileTemplate getDefaultTemplate(@NotNull @NonNls String name);
 
   public abstract void setTemplates(@NotNull String templatesCategory, @NotNull Collection<FileTemplate> templates);
-  
+
+  public abstract void saveAllTemplates();
 }

platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java

@@ -421,6 +421,13 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Pers
     }
   }
 
+  @Override
+  public void saveAllTemplates() {
+    for (FTManager manager : myAllManagers) {
+      manager.saveTemplates();
+    }
+  }
+
   public URL getDefaultTemplateDescription() {
     return myDefaultTemplateDescription;
   }

plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaI18nizeQuickFixDialog.java

@@ -149,6 +149,7 @@ public class JavaI18nizeQuickFixDialog extends I18nizeQuickFixDialog {
           });
           boolean ok = ShowSettingsUtil.getInstance().editConfigurable(myPanel, configurable);
           if (ok) {
+            FileTemplateManager.getInstance(myProject).saveAllTemplates();
             somethingChanged();
             if (myShowJavaCodeInfo) {
               suggestAvailableResourceBundleExpressions();