diff: do not show 'contents identical' if we can't calculate diff
[idea/community.git] / platform / platform-impl / src / com / intellij / openapi / diff / impl / highlighting / FragmentedDiffPanelState.java
index 7e395c1b4a9ecb0eabb822bd69fff5f34b66a590..3efb946fc0e10309ddb89707d5ad67dff3fa6c60 100644 (file)
@@ -32,6 +32,7 @@ import com.intellij.util.BeforeAfter;
 import com.intellij.util.Consumer;
 import com.intellij.util.diff.FilesTooBigForDiffException;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
@@ -90,11 +91,12 @@ public class FragmentedDiffPanelState extends DiffPanelState {
     myAppender2.resetHighlighters();
   }
 
+  @Nullable
   public LineBlocks updateEditors() throws FilesTooBigForDiffException {
     resetMarkup();
     mySeparatorsPositionConsumer.clear();
     if (myAppender1.getEditor() == null || myAppender2.getEditor() == null) {
-      return LineBlocks.EMPTY;
+      return null;
     }
 
     int previousBefore = -1;