fix initial editor state in CustomTemplateCallback's constructor

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 854c6d05290dabb69fb303abb3926297f934ff56..a62ab10381531799c32a462a485d404e845d95ff 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java
@@ -43,23 +43,13 @@ public class CustomTemplateCallback {
   private Project myProject;
   private RangeMarker myGlobalMarker;
   private RangeMarker myEndOffsetMarker;
-
-  //private final Map<Object, MyCheckpoint> myCheckpoints = new HashMap<Object, MyCheckpoint>();
   private final Map<Object, RangeMarker> myCheckpoints = new HashMap<Object, RangeMarker>();
 
-  /*private static class MyCheckpoint {
-    int myFixedLength = null;
-    RangeMarker myFixedOffset;
-  }*/
-
   public CustomTemplateCallback(Editor editor, PsiFile file) {
     myEditor = editor;
     myFile = file;
     myProject = file.getProject();
     myTemplateManager = TemplateManagerImpl.getInstance(myProject);
-  }
-
-  public void fixInitialEditorState() {
     myStartOffset = myEditor.getCaretModel().getOffset();
     myGlobalMarker = myEditor.getDocument().createRangeMarker(myStartOffset, myStartOffset);
     myGlobalMarker.setGreedyToLeft(true);

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java
index d8baf07f3855e2f4a225e2aebcda31c4f64bf10f..0a331403e0df923645062d2e4a1eb1d2ad916891 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java
@@ -246,7 +246,6 @@ public class TemplateManagerImpl extends TemplateManager implements ProjectCompo
         int caretOffset = editor.getCaretModel().getOffset();
         if (customLiveTemplate.isApplicable(file, caretOffset, false)) {
           final CustomTemplateCallback callback = new CustomTemplateCallback(editor, file);
-          callback.fixInitialEditorState();
           String key = customLiveTemplate.computeTemplateKey(callback);
           if (key != null) {
             int offsetBeforeKey = caretOffset - key.length();