feat: store endif lines when parsing variation diffs

Author: eugen-shulimov

src/main/java/org/variantsync/diffdetective/variation/VariationUnparser.java

@@ -1,6 +1,5 @@
 package org.variantsync.diffdetective.variation;
 
-import java.util.ArrayList;
 import java.util.Stack;
 import org.variantsync.diffdetective.variation.tree.VariationTree;
 import org.variantsync.diffdetective.variation.tree.VariationTreeNode;
@@ -19,10 +18,8 @@ public static String variationTreeUnparser(VariationTree<? extends Label> tree)
                 result.append("\n");
             }
             if (node.isIf()) {
-                ArrayList<String> list = new ArrayList<>();
-                list.add(node.getEndIf());
                 stack.push(new VariationTreeNode<>(NodeType.ARTIFACT, null, null,
-                        DiffLinesLabel.withInvalidLineNumbers(list)));
+                        DiffLinesLabel.withInvalidLineNumbers(node.getEndIf())));
             }
             for (int i = node.getChildren().size() - 1; i >= 0; i--) {
                 stack.push(node.getChildren().get(i));

src/main/java/org/variantsync/diffdetective/variation/diff/DiffNode.java

@@ -51,7 +51,7 @@ public class DiffNode<L extends Label> implements HasNodeType {
 
     private Node featureMapping;
 
-    private String endIf = null;
+    private List<String> endIf = null;
 
     /**
      * The parents {@link DiffNode} before and after the edit.
@@ -152,15 +152,15 @@ public void setLabel(L newLabel) {
      * Returns the line with the endif of the corresponding if, if the node is an if node, otherwise null
      * @return String, the Line with endif
      */
-    public String getEndIf() {
+    public List<String> getEndIf() {
         return endIf;
     }
 
     /**
      * Sets the line with the endif of the corresponding if, if the node is an if node
      * @param endIf String, the Line with endif
      */
-    public void setEndIf(String endIf) {
+    public void setEndIf(List<String> endIf) {
         this.endIf = endIf;
     }
 

src/main/java/org/variantsync/diffdetective/variation/diff/Projection.java

@@ -123,7 +123,7 @@ public int getID() {
     }
 
     @Override
-    public String getEndIf() {
+    public List<String> getEndIf() {
         return getBackingNode().getEndIf();
     }
 };

src/main/java/org/variantsync/diffdetective/variation/diff/parse/VariationDiffParser.java

@@ -1,5 +1,7 @@
 package org.variantsync.diffdetective.variation.diff.parse;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.commons.lang3.function.FailableSupplier;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.lib.ObjectId;
@@ -327,7 +329,7 @@ private void parseLine(
             // Do not create a node for ENDIF, but update the line numbers of the closed if-chain
             // and remove that if-chain from the relevant stacks.
             diffType.forAllTimesOfExistence(beforeStack, afterStack, stack ->
-                    popIfChain(stack, fromLine)
+                    popIfChain(stack, fromLine, line)
             );
         } else if (options.collapseMultipleCodeLines()
                 && annotation.type() == AnnotationType.None
@@ -361,15 +363,24 @@ private void parseLine(
      *
      * @param stack          the stack which should be popped
      * @param elseLineNumber the first line of the else which causes this IF to be popped
+     * @param line           the line containing the endif
      * @throws DiffParseException if {@code stack} doesn't contain an IF node
      */
     private void popIfChain(
             Stack<DiffNode<DiffLinesLabel>> stack,
-            DiffLineNumber elseLineNumber
+            DiffLineNumber elseLineNumber,
+            LogicalLine line
     ) throws DiffParseException {
         DiffLineNumber previousLineNumber = elseLineNumber;
         do {
             DiffNode<DiffLinesLabel> annotation = stack.peek();
+            if (annotation.isIf()) {
+                List<String> list = new ArrayList<>();
+                for (int i = 0; i < line.getLines().size(); i++) {
+                    list.add(line.getLines().get(i).content());
+                }
+                annotation.setEndIf(list);
+            }
 
             // Set the line number of now closed annotations to the beginning of the
             // following annotation.

src/main/java/org/variantsync/diffdetective/variation/tree/VariationNode.java

@@ -117,7 +117,7 @@ public VariationNode<T, L> downCast() {
      * Returns the line with the endif of the corresponding if, if the node is an if node, otherwise null
      * @return String, the Line with endif
      */
-    public abstract String getEndIf();
+    public abstract List<String> getEndIf();
 
     /**
      * Returns {@code true} iff this node has no parent.

src/main/java/org/variantsync/diffdetective/variation/tree/VariationTreeNode.java

@@ -85,7 +85,7 @@ public class VariationTreeNode<L extends Label> extends VariationNode<VariationT
     /**
      * The line with the endif of the corresponding if, if the node is an if node, otherwise null
      */
-    private String endIf = null;
+    private List<String> endIf = null;
 
     /**
      * Creates a new node of a variation tree.
@@ -235,15 +235,15 @@ public void removeAllChildren() {
      * Returns the line with the endif of the corresponding if, if the node is an if node, otherwise null
      * @return String, the Line with endif
      */
-    public String getEndIf() {
+    public List<String> getEndIf() {
         return endIf;
     }
 
     /**
      * Sets the line with the endif of the corresponding if, if the node is an if node
      * @param endIf String, the Line with endif
      */
-    public void setEndIf(String endIf) {
+    public void setEndIf(List<String> endIf) {
         this.endIf = endIf;
     }
 

src/test/java/VariationUnparserTest.java

@@ -33,7 +33,6 @@ public void tests() {
         findTestCases(testDir).forEach(this::test);
     }
 
-    @Disabled
     @Test
     public void teststest() {
         Path path = testDir.resolve("test2.txt");