From 2fcc7ff4d4fe184c0595c6c09828236b5357419a Mon Sep 17 00:00:00 2001
From: anstarovoyt <andrey.starovoyt@jetbrains.com>
Date: Wed, 18 Apr 2018 15:07:57 +0500
Subject: [PATCH] ts editable postfix templates

---
 .../editable/JavaEditablePostfixTemplate.java |  2 +-
 .../editable/JavaPostfixTemplateEditor.java   | 17 +-------------
 ...avaPostfixTemplateExpressionCondition.java | 14 ++++++------
 .../settings/PostfixTemplateEditorBase.java   | 22 ++++++++++++++++---
 .../templates/PostfixTemplatesUtils.java      |  8 +++----
 ...stfixTemplateWithMultipleExpressions.java} | 18 +++++++--------
 .../PostfixTemplateExpressionCondition.java   |  7 ++++--
 7 files changed, 46 insertions(+), 42 deletions(-)
 rename platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/{EditablePostfixTemplateWithConditions.java => EditablePostfixTemplateWithMultipleExpressions.java} (72%)

diff --git a/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaEditablePostfixTemplate.java b/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaEditablePostfixTemplate.java
index d5d05819c224..7b8538a64184 100644
--- a/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaEditablePostfixTemplate.java
+++ b/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaEditablePostfixTemplate.java
@@ -26,7 +26,7 @@ import java.util.Objects;
 import java.util.Set;
 
 public class JavaEditablePostfixTemplate
-  extends EditablePostfixTemplateWithConditions<JavaPostfixTemplateExpressionCondition> {
+  extends EditablePostfixTemplateWithMultipleExpressions<JavaPostfixTemplateExpressionCondition> {
   private static final Condition<PsiElement> PSI_ERROR_FILTER = element -> !PsiTreeUtil.hasErrorElements(element);
 
   @NotNull private final LanguageLevel myMinimumLanguageLevel;
diff --git a/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaPostfixTemplateEditor.java b/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaPostfixTemplateEditor.java
index 717e8763189b..8ff0361cce03 100644
--- a/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaPostfixTemplateEditor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaPostfixTemplateEditor.java
@@ -108,22 +108,7 @@ public class JavaPostfixTemplateEditor extends PostfixTemplateEditorBase<JavaPos
       myLanguageLevelCombo.setSelectedItem(((JavaEditablePostfixTemplate)template).getMinimumLanguageLevel());
     }
   }
-
-  private class AddConditionAction extends DumbAwareAction {
-    @NotNull
-    private final JavaPostfixTemplateExpressionCondition myCondition;
-
-    public AddConditionAction(JavaPostfixTemplateExpressionCondition condition) {
-      super(condition.getPresentableName());
-      myCondition = condition;
-    }
-
-    @Override
-    public void actionPerformed(AnActionEvent e) {
-      myExpressionTypesListModel.addElement(myCondition);
-    }
-  }
-
+  
   private class ChooseClassAction extends DumbAwareAction {
     @Nullable
     private final Project myProject;
diff --git a/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaPostfixTemplateExpressionCondition.java b/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaPostfixTemplateExpressionCondition.java
index 1d47218ebd89..53ac1a9a7a6b 100644
--- a/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaPostfixTemplateExpressionCondition.java
+++ b/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaPostfixTemplateExpressionCondition.java
@@ -27,7 +27,7 @@ public interface JavaPostfixTemplateExpressionCondition extends PostfixTemplateE
     }
 
     @Override
-    public boolean value(PsiExpression element) {
+    public boolean value(@NotNull PsiExpression element) {
       PsiType type = element.getType();
       return type != null && InheritanceUtil.isInheritor(type, myFqn);
     }
@@ -68,7 +68,7 @@ public interface JavaPostfixTemplateExpressionCondition extends PostfixTemplateE
     public static final String ID = "void";
 
     @Override
-    public boolean value(PsiExpression element) {
+    public boolean value(@NotNull PsiExpression element) {
       PsiType type = element.getType();
       return type != null && PsiType.VOID.equals(type);
     }
@@ -102,7 +102,7 @@ public interface JavaPostfixTemplateExpressionCondition extends PostfixTemplateE
     public static final String ID = "non void";
 
     @Override
-    public boolean value(PsiExpression element) {
+    public boolean value(@NotNull PsiExpression element) {
       return JavaPostfixTemplatesUtils.isNonVoid(element.getType());
     }
 
@@ -134,7 +134,7 @@ public interface JavaPostfixTemplateExpressionCondition extends PostfixTemplateE
     public static final String ID = "boolean";
 
     @Override
-    public boolean value(PsiExpression element) {
+    public boolean value(@NotNull PsiExpression element) {
       return JavaPostfixTemplatesUtils.isBoolean(element.getType());
     }
 
@@ -166,7 +166,7 @@ public interface JavaPostfixTemplateExpressionCondition extends PostfixTemplateE
     public static final String ID = "number";
 
     @Override
-    public boolean value(PsiExpression element) {
+    public boolean value(@NotNull PsiExpression element) {
       return JavaPostfixTemplatesUtils.isNumber(element.getType());
     }
 
@@ -198,7 +198,7 @@ public interface JavaPostfixTemplateExpressionCondition extends PostfixTemplateE
     public static final String ID = "notPrimitive";
 
     @Override
-    public boolean value(PsiExpression element) {
+    public boolean value(@NotNull PsiExpression element) {
       return JavaPostfixTemplatesUtils.isNotPrimitiveTypeExpression(element);
     }
 
@@ -230,7 +230,7 @@ public interface JavaPostfixTemplateExpressionCondition extends PostfixTemplateE
     public static final String ID = "array";
 
     @Override
-    public boolean value(PsiExpression element) {
+    public boolean value(@NotNull PsiExpression element) {
       return JavaPostfixTemplatesUtils.isArray(element.getType());
     }
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplateEditorBase.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplateEditorBase.java
index 4b163036ff5a..3b2b40a7a74a 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplateEditorBase.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplateEditorBase.java
@@ -4,16 +4,18 @@ package com.intellij.codeInsight.template.postfix.settings;
 import com.intellij.codeInsight.template.impl.TemplateEditorUtil;
 import com.intellij.codeInsight.template.postfix.templates.PostfixTemplate;
 import com.intellij.codeInsight.template.postfix.templates.PostfixTemplateProvider;
-import com.intellij.codeInsight.template.postfix.templates.editable.EditablePostfixTemplateWithConditions;
+import com.intellij.codeInsight.template.postfix.templates.editable.EditablePostfixTemplateWithMultipleExpressions;
 import com.intellij.codeInsight.template.postfix.templates.editable.PostfixTemplateEditor;
 import com.intellij.codeInsight.template.postfix.templates.editable.PostfixTemplateExpressionCondition;
 import com.intellij.ide.DataManager;
+import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.EditorFactory;
+import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
@@ -48,6 +50,20 @@ public abstract class PostfixTemplateEditorBase<Condition extends PostfixTemplat
   @NotNull protected final JPanel myEditTemplateAndConditionsPanel;
   @NotNull protected final JBLabel myExpressionVariableHint;
 
+  protected class AddConditionAction extends DumbAwareAction {
+    @NotNull
+    private final Condition myCondition;
+
+    public AddConditionAction(Condition condition) {
+      super(condition.getPresentableName());
+      myCondition = condition;
+    }
+
+    @Override
+    public void actionPerformed(AnActionEvent e) {
+      myExpressionTypesListModel.addElement(myCondition);
+    }
+  }
 
   public PostfixTemplateEditorBase(@NotNull PostfixTemplateProvider provider) {
     this(provider, createSimpleEditor());
@@ -121,10 +137,10 @@ public abstract class PostfixTemplateEditorBase<Condition extends PostfixTemplat
   protected abstract void fillConditions(@NotNull DefaultActionGroup group);
 
   public void setTemplate(@Nullable PostfixTemplate rawTemplate) {
-    if (!(rawTemplate instanceof EditablePostfixTemplateWithConditions)) return;
+    if (!(rawTemplate instanceof EditablePostfixTemplateWithMultipleExpressions)) return;
 
     //noinspection unchecked
-    EditablePostfixTemplateWithConditions<Condition> template = (EditablePostfixTemplateWithConditions)rawTemplate;
+    EditablePostfixTemplateWithMultipleExpressions<Condition> template = (EditablePostfixTemplateWithMultipleExpressions)rawTemplate;
 
     myExpressionTypesListModel.clear();
     for (Condition condition : template.getExpressionConditions()) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplatesUtils.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplatesUtils.java
index fedf0fe5703b..ccbf74eda7b3 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplatesUtils.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplatesUtils.java
@@ -5,7 +5,7 @@ import com.intellij.codeInsight.template.impl.TemplateImpl;
 import com.intellij.codeInsight.template.impl.TemplateSettings;
 import com.intellij.codeInsight.template.postfix.settings.PostfixTemplateStorage;
 import com.intellij.codeInsight.template.postfix.templates.editable.EditablePostfixTemplate;
-import com.intellij.codeInsight.template.postfix.templates.editable.EditablePostfixTemplateWithConditions;
+import com.intellij.codeInsight.template.postfix.templates.editable.EditablePostfixTemplateWithMultipleExpressions;
 import com.intellij.codeInsight.template.postfix.templates.editable.PostfixChangedBuiltinTemplate;
 import com.intellij.codeInsight.template.postfix.templates.editable.PostfixTemplateExpressionCondition;
 import com.intellij.lang.surroundWith.Surrounder;
@@ -83,13 +83,13 @@ public abstract class PostfixTemplatesUtils {
   }
 
   public static void writeExternalTemplate(@NotNull PostfixTemplate template, @NotNull Element parentElement) {
-    if (template instanceof EditablePostfixTemplateWithConditions) {
-      parentElement.setAttribute(TOPMOST_ATTR, String.valueOf(((EditablePostfixTemplateWithConditions)template).isUseTopmostExpression()));
+    if (template instanceof EditablePostfixTemplateWithMultipleExpressions) {
+      parentElement.setAttribute(TOPMOST_ATTR, String.valueOf(((EditablePostfixTemplateWithMultipleExpressions)template).isUseTopmostExpression()));
       Element conditionsTag = new Element(CONDITIONS_TAG);
 
       //noinspection unchecked
       Set<? extends PostfixTemplateExpressionCondition<? extends PsiElement>> conditions =
-        (Set<? extends PostfixTemplateExpressionCondition<? extends PsiElement>>)((EditablePostfixTemplateWithConditions)template)
+        (Set<? extends PostfixTemplateExpressionCondition<? extends PsiElement>>)((EditablePostfixTemplateWithMultipleExpressions)template)
           .getExpressionConditions();
 
       for (PostfixTemplateExpressionCondition<? extends PsiElement> condition : conditions) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/EditablePostfixTemplateWithConditions.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/EditablePostfixTemplateWithMultipleExpressions.java
similarity index 72%
rename from platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/EditablePostfixTemplateWithConditions.java
rename to platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/EditablePostfixTemplateWithMultipleExpressions.java
index 3e7dc0c90eec..2cfa22f0b3e2 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/EditablePostfixTemplateWithConditions.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/EditablePostfixTemplateWithMultipleExpressions.java
@@ -10,19 +10,19 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Objects;
 import java.util.Set;
 
-public abstract class EditablePostfixTemplateWithConditions<ConditionType extends PostfixTemplateExpressionCondition>
+public abstract class EditablePostfixTemplateWithMultipleExpressions<ConditionType extends PostfixTemplateExpressionCondition>
   extends EditablePostfixTemplate {
 
   @NotNull protected final Set<ConditionType> myExpressionConditions;
   protected final boolean myUseTopmostExpression;
 
-  protected EditablePostfixTemplateWithConditions(@NotNull String templateId,
-                                                  @NotNull String templateName,
-                                                  @NotNull TemplateImpl liveTemplate,
-                                                  @NotNull String example,
-                                                  @NotNull Set<ConditionType> expressionConditions,
-                                                  boolean useTopmostExpression,
-                                                  @NotNull PostfixTemplateProvider provider) {
+  protected EditablePostfixTemplateWithMultipleExpressions(@NotNull String templateId,
+                                                           @NotNull String templateName,
+                                                           @NotNull TemplateImpl liveTemplate,
+                                                           @NotNull String example,
+                                                           @NotNull Set<ConditionType> expressionConditions,
+                                                           boolean useTopmostExpression,
+                                                           @NotNull PostfixTemplateProvider provider) {
     super(templateId, templateName, liveTemplate, example, provider);
     myExpressionConditions = expressionConditions;
     myUseTopmostExpression = useTopmostExpression;
@@ -64,7 +64,7 @@ public abstract class EditablePostfixTemplateWithConditions<ConditionType extend
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     if (!super.equals(o)) return false;
-    EditablePostfixTemplateWithConditions<?> that = (EditablePostfixTemplateWithConditions<?>)o;
+    EditablePostfixTemplateWithMultipleExpressions<?> that = (EditablePostfixTemplateWithMultipleExpressions<?>)o;
     return myUseTopmostExpression == that.myUseTopmostExpression &&
            Objects.equals(myExpressionConditions, that.myExpressionConditions);
   }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/PostfixTemplateExpressionCondition.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/PostfixTemplateExpressionCondition.java
index 4991db7a1a1f..71e0be1a6541 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/PostfixTemplateExpressionCondition.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/PostfixTemplateExpressionCondition.java
@@ -22,12 +22,15 @@ public interface PostfixTemplateExpressionCondition<T extends PsiElement> extend
    */
   @NotNull
   String getId();
-  
+
   boolean equals(Object o);
-  
+
   int hashCode();
 
   default void serializeTo(@NotNull Element element) {
     element.setAttribute(ID_ATTR, getId());
   }
+
+  @Override
+  boolean value(@NotNull T t);
 }