Handle more cases

palantir · Nov 19, 2019 · 19e5f6b · 19e5f6b
1 parent b27c11f
commit 19e5f6b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/idea-plugin/src/main/java/com/palantir/javaformat/intellij/CodeStyleManagerDecorator.java b/idea-plugin/src/main/java/com/palantir/javaformat/intellij/CodeStyleManagerDecorator.java
@@ -65,10 +65,9 @@ public PsiElement reformat(PsiElement element, boolean canChangeWhiteSpacesOnly)
     }
 
     @Override
-    public final PsiElement reformatRange(PsiElement element, int startOffset, int endOffset)
+    public PsiElement reformatRange(PsiElement element, int startOffset, int endOffset)
             throws IncorrectOperationException {
-        // Preserve the fallback defined in CodeStyleManagerImpl
-        return reformatRange(element, startOffset, endOffset, false);
+        return delegate.reformatRange(element, startOffset, endOffset);
     }
 
     @Override

diff --git a/idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirCodeStyleManager.java b/idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirCodeStyleManager.java
@@ -39,6 +39,7 @@
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.codeStyle.ChangedRangesInfo;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.impl.CheckUtil;
 import com.intellij.psi.impl.source.codeStyle.CodeStyleManagerImpl;
@@ -132,6 +133,12 @@ public void reformatText(PsiFile file, Collection<TextRange> ranges) throws Inco
         }
     }
 
+    @Override
+    public void reformatTextWithContext(PsiFile psiFile, ChangedRangesInfo changedRangesInfo)
+            throws IncorrectOperationException {
+        reformatTextWithContext(psiFile, changedRangesInfo.allChangedRanges);
+    }
+
     @Override
     public void reformatTextWithContext(PsiFile file, Collection<TextRange> ranges) {
         if (overrideFormatterForFile(file)) {
@@ -141,6 +148,13 @@ public void reformatTextWithContext(PsiFile file, Collection<TextRange> ranges)
         }
     }
 
+    @Override
+    public PsiElement reformatRange(PsiElement element, int startOffset, int endOffset)
+            throws IncorrectOperationException {
+        // Preserve the fallback defined in CodeStyleManagerImpl
+        return reformatRange(element, startOffset, endOffset, false);
+    }
+
     @Override
     public PsiElement reformatRange(
             PsiElement element, int startOffset, int endOffset, boolean canChangeWhiteSpacesOnly) {