Only format changed regions in 'before commit' mode

Related: facebook/ktfmt#228 Follow-up to 69ba30f PiperOrigin-RevId: 372590998
google · May 12, 2021 · fddfa97 · fddfa97
1 parent 72672b0
commit fddfa97
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatCodeStyleManager.java b/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatCodeStyleManager.java
@@ -34,8 +34,9 @@
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.impl.CheckUtil;
 import com.intellij.util.IncorrectOperationException;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
@@ -72,9 +73,14 @@ public void reformatText(PsiFile file, Collection<? extends TextRange> ranges)
   }
 
   @Override
-  public void reformatTextWithContext(PsiFile file, ChangedRangesInfo changedRangesInfo)
+  public void reformatTextWithContext(PsiFile file, ChangedRangesInfo info)
       throws IncorrectOperationException {
-    reformatTextWithContext(file, Collections.singletonList(file.getTextRange()));
+    List<TextRange> ranges = new ArrayList<>();
+    if (info.insertedRanges != null) {
+      ranges.addAll(info.insertedRanges);
+    }
+    ranges.addAll(info.allChangedRanges);
+    reformatTextWithContext(file, ranges);
   }
 
   @Override