start template without key; refactoring

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java b/platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java
index b6128d041feabfc06572f0f93d9dc112359a7522..feaac8aded4c4c9e05e3dd3d419d7659edb8fc2c 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java
@@ -173,12 +173,9 @@ public class CustomTemplateCallback {
     myCheckpoints.clear();
   }
 
-  public boolean startTemplate(@NotNull String key) {
-    List<TemplateImpl> templates = findApplicableTemplates(key);
-    Map<TemplateImpl, String> template2Argument = new HashMap<TemplateImpl, String>();
-    for (TemplateImpl template : templates) {
-      template2Argument.put(template, null);
-    }
+  public boolean startTemplate() {
+    Map<TemplateImpl, String> template2Argument =
+      ((TemplateManagerImpl)myTemplateManager).findMatchingTemplates(myFile, myEditor, null, TemplateSettings.getInstance());
     return ((TemplateManagerImpl)myTemplateManager).startNonCustomTemplates(template2Argument, myEditor, null);
   }
 

diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingTemplate.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingTemplate.java
index ec6078bc5b6b7a3a9aa6f8897d8b724403632326..445280d738596b10fa748d42cbdbe5423d16291a 100644 (file)
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingTemplate.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingTemplate.java
@@ -297,6 +297,10 @@ public class XmlZenCodingTemplate implements CustomLiveTemplate {
   }
 
   public String computeTemplateKey(@NotNull CustomTemplateCallback callback) {
+    return computeKey(callback);
+  }
+
+  static String computeKey(CustomTemplateCallback callback) {
     Editor editor = callback.getEditor();
     PsiElement element = callback.getContext();
     int line = editor.getCaretModel().getLogicalPosition().line;
@@ -374,7 +378,7 @@ public class XmlZenCodingTemplate implements CustomLiveTemplate {
         Token token = tokens.get(0);
         if (token instanceof TemplateToken) {
           if (key.equals(((TemplateToken)token).myKey) && callback.findApplicableTemplates(key).size() > 1) {
-            callback.startTemplate(key);
+            callback.startTemplate();
             return;
           }
         }