From 9f2f10f6ec8461efbe80522627a791aeb98f80b0 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <ampivovarov@gmail.com>
Date: Sat, 4 Feb 2017 20:14:46 +0300
Subject: [PATCH] diff: remove unnecessary field

---
 .../diff/tools/fragmented/ChangedBlock.java         | 13 +++----------
 .../tools/fragmented/UnifiedFragmentBuilder.java    |  3 +--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/ChangedBlock.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/ChangedBlock.java
index 3be804c1987e..936f6f728adf 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/ChangedBlock.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/ChangedBlock.java
@@ -20,21 +20,14 @@ import com.intellij.diff.util.LineRange;
 import org.jetbrains.annotations.NotNull;
 
 class ChangedBlock {
-  private final int myLine1;
-  private final int myLine2;
-
   @NotNull private final LineRange myRange1;
   @NotNull private final LineRange myRange2;
 
   @NotNull private final LineFragment myLineFragment;
 
-  public ChangedBlock(int line1,
-                      int line2,
-                      @NotNull LineRange range1,
+  public ChangedBlock(@NotNull LineRange range1,
                       @NotNull LineRange range2,
                       @NotNull LineFragment lineFragment) {
-    myLine1 = line1;
-    myLine2 = line2;
     myRange1 = range1;
     myRange2 = range2;
     myLineFragment = lineFragment;
@@ -51,11 +44,11 @@ class ChangedBlock {
   }
 
   public int getLine1() {
-    return myLine1;
+    return myRange1.start;
   }
 
   public int getLine2() {
-    return myLine2;
+    return myRange2.end;
   }
 
   @NotNull
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilder.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilder.java
index 143ebf9bb958..42a562a7fc27 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilder.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilder.java
@@ -109,8 +109,7 @@ class UnifiedFragmentBuilder {
     int blockStartLine2 = linesBetween;
     int blockEndLine2 = linesAfter;
 
-    myBlocks.add(new ChangedBlock(linesBefore, linesAfter,
-                                  new LineRange(blockStartLine1, blockEndLine1),
+    myBlocks.add(new ChangedBlock(new LineRange(blockStartLine1, blockEndLine1),
                                   new LineRange(blockStartLine2, blockEndLine2),
                                   fragment));