Live Templates: remove never used ability to reformat custom range in template

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
index ac5f4e0c2537eac4c4ed1fa29d3eaace98d31963..1f1c242b84303cbdeb1749f08197a2fc599a2212 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
@@ -439,7 +439,7 @@ public class TemplateState implements Disposable {
       LOG.assertTrue(myTemplateRange.isValid(), getRangesDebugInfo());
       calcResults(false);  //Fixed SCR #[vk500] : all variables should be recalced twice on start.
       LOG.assertTrue(myTemplateRange.isValid(), getRangesDebugInfo());
-      doReformat(null);
+      doReformat();
 
       int nextVariableNumber = getNextVariableNumber(-1);
 
@@ -468,14 +468,7 @@ public class TemplateState implements Disposable {
            "\ntemplateString: " + myTemplate;
   }
 
-  private void doReformat(final TextRange range) {
-    RangeMarker rangeMarker = null;
-    if (range != null) {
-      rangeMarker = myDocument.createRangeMarker(range);
-      rangeMarker.setGreedyToLeft(true);
-      rangeMarker.setGreedyToRight(true);
-    }
-    final RangeMarker finalRangeMarker = rangeMarker;
+  private void doReformat() {
     final Runnable action = () -> {
       IntArrayList indices = initEmptyVariables();
       mySegments.setSegmentsGreedy(false);
@@ -483,7 +476,7 @@ public class TemplateState implements Disposable {
                      "template key: " + myTemplate.getKey() + "; " +
                      "template text" + myTemplate.getTemplateText() + "; " +
                      "variable number: " + getCurrentVariableNumber());
-      reformat(finalRangeMarker);
+      reformat();
       mySegments.setSegmentsGreedy(true);
       restoreEmptyVariables(indices);
     };
@@ -912,7 +905,7 @@ public class TemplateState implements Disposable {
     if (previousVariableNumber >= 0) {
       focusCurrentHighlighter(false);
       calcResults(false);
-      doReformat(null);
+      doReformat();
       setCurrentVariableNumber(previousVariableNumber);
       focusCurrentExpression();
       currentVariableChanged(oldVar);
@@ -933,13 +926,13 @@ public class TemplateState implements Disposable {
     int nextVariableNumber = getNextVariableNumber(oldVar);
     if (nextVariableNumber == -1) {
       calcResults(false);
-      ApplicationManager.getApplication().runWriteAction(() -> reformat(null));
+      ApplicationManager.getApplication().runWriteAction(() -> reformat());
       finishTemplateEditing();
       return;
     }
     focusCurrentHighlighter(false);
     calcResults(false);
-    doReformat(null);
+    doReformat();
     setCurrentVariableNumber(nextVariableNumber);
     focusCurrentExpression();
     currentVariableChanged(oldVar);
@@ -1033,7 +1026,7 @@ public class TemplateState implements Disposable {
     LookupManager.getInstance(myProject).hideActiveLookup();
     calcResults(false);
     if (!brokenOff) {
-      doReformat(null);
+      doReformat();
     }
     setFinalEditorState(brokenOff);
     cleanupTemplateState(brokenOff);
@@ -1252,7 +1245,7 @@ public class TemplateState implements Disposable {
     }
   }
 
-  private void reformat(RangeMarker rangeMarkerToReformat) {
+  private void reformat() {
     final PsiFile file = getPsiFile();
     if (file != null) {
       CodeStyleManager style = CodeStyleManager.getInstance(myProject);
@@ -1284,10 +1277,6 @@ public class TemplateState implements Disposable {
           }
           int reformatStartOffset = myTemplateRange.getStartOffset();
           int reformatEndOffset = myTemplateRange.getEndOffset();
-          if (rangeMarkerToReformat != null) {
-            reformatStartOffset = rangeMarkerToReformat.getStartOffset();
-            reformatEndOffset = rangeMarkerToReformat.getEndOffset();
-          }
           if (dummyAdjustLineMarkerRange == null && endVarOffset >= 0) {
             // There is a possible case that indent marker element was not inserted (e.g. because there is no blank line
             // at the target offset). However, we want to reformat white space adjacent to the current template (if any).