IDEA-89012 Live Template - Edit Variable - variable order is ignored

platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateImpl.java

@@ -449,6 +449,10 @@ public class TemplateImpl extends Template implements SchemeElement {
     return myVariables.get(i).skipOnStart();
   }
 
+  public ArrayList<Variable> getVariables() {
+    return myVariables;
+  }
+
   private static class Segment {
     public String name;
     public int offset;

platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java

@@ -252,6 +252,10 @@ public class TemplateListPanel extends JPanel implements Disposable {
         return false;
       }
 
+      if (!newTemplate.getVariables().equals(originalTemplate.getVariables())) {
+        return false;
+      }
+
       if (!areOptionsEqual(newTemplate, originalTemplate)) {
         return false;
       }

platform/lang-impl/src/com/intellij/codeInsight/template/impl/Variable.java

@@ -124,6 +124,17 @@ public class Variable implements Cloneable {
     return result;
   }
 
+  @Override
+  public String toString() {
+    return "Variable{" +
+           "myName='" + myName + '\'' +
+           ", myAlwaysStopAt=" + myAlwaysStopAt +
+           ", myExpressionString='" + myExpressionString + '\'' +
+           ", myDefaultValueString='" + myDefaultValueString + '\'' +
+           ", mySkipOnStart=" + mySkipOnStart +
+           '}';
+  }
+
   public boolean skipOnStart() {
     return mySkipOnStart;
   }