fix: don't join syntactically different DiffNodes

ibbem · ibbem · commit 99a34f4a3aae · 2025-10-03T16:46:02.000+02:00
diff --git a/src/main/java/org/variantsync/diffdetective/gumtree/VariationTreeAdapter.java b/src/main/java/org/variantsync/diffdetective/gumtree/VariationTreeAdapter.java
@@ -32,15 +32,11 @@ public VariationTreeAdapter(VariationNode<?, L> node) {
         this.backingNode = node;
         this.metadata = new LinkedHashMap<>();
 
-        if (backingNode.isConditionalAnnotation()) {
-            cachedLabel = backingNode.getFormula().toString();
-        } else {
-            cachedLabel =
-                Stream.concat(
-                    backingNode.getLabel().getLines().stream(),
-                    backingNode.getLabel().getTrailingLines().stream()
-                ).collect(Collectors.joining("\n"));
-        }
+        cachedLabel =
+            Stream.concat(
+                backingNode.getLabel().getLines().stream(),
+                backingNode.getLabel().getTrailingLines().stream()
+            ).collect(Collectors.joining("\n"));
 
         var children = new ArrayList<Tree>(node.getChildren().size());
         for (var child : node.getChildren()) {
diff --git a/src/main/java/org/variantsync/diffdetective/variation/diff/construction/GumTreeDiff.java b/src/main/java/org/variantsync/diffdetective/variation/diff/construction/GumTreeDiff.java
@@ -217,7 +217,11 @@ public static <L extends Label> DiffNode<L> improveMatching(DiffNode<L> tree, Ma
                         afterNode.split(BEFORE);
                     }
 
-                    beforeNode.join(afterNode, (beforeLabel, afterLabel) -> beforeLabel);
+                    beforeNode.join(afterNode, (beforeLabel, afterLabel) -> {
+                        Assert.assertEquals(beforeLabel.getLines(), afterLabel.getLines());
+                        Assert.assertEquals(beforeLabel.getTrailingLines(), afterLabel.getTrailingLines());
+                        return beforeLabel;
+                    });
                 }
 
                 Assert.assertTrue(beforeNode.isNon());
diff --git a/src/test/resources/tree-diffing/createMatching/06_gumtree-hybrid_expected.lg b/src/test/resources/tree-diffing/createMatching/06_gumtree-hybrid_expected.lg
@@ -1,10 +1,13 @@
 v 80 NON;IF;(old: -1, diff: 0, new: -1);(old: -1, diff: 0, new: -1);True
-v 144 NON;IF;(old: 1, diff: 1, new: 1);(old: 4, diff: 1, new: 4);defined(A);#ifdef A
+v 136 REM;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 1, new: -1);defined(A);#ifdef A
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 2);(old: 3, diff: 2, new: 3);;Line A
 v 275 NON;ARTIFACT;(old: 3, diff: 3, new: 3);(old: 4, diff: 3, new: 4);;Line B
-v 322 ADD;ELIF;(old: -1, diff: 4, new: 3);(old: -1, diff: 4, new: 5);B;#elif B
-e 144 80 ba;0,0
-e 211 144 ba;0,0
-e 275 144 b;1,-1
-e 322 144 a;-1,1
-e 275 322 a;-1,0
+v 320 ADD;IF;(old: -1, diff: 4, new: 1);(old: -1, diff: 4, new: 3);defined(A);#ifdef A
+v 386 ADD;ELIF;(old: -1, diff: 5, new: 3);(old: -1, diff: 5, new: 5);B;#elif B
+e 136 80 b;0,-1
+e 320 80 a;-1,0
+e 211 136 b;0,-1
+e 275 136 b;1,-1
+e 211 320 a;-1,0
+e 386 320 a;-1,1
+e 275 386 a;-1,0
diff --git a/src/test/resources/tree-diffing/createMatching/06_gumtree_expected.lg b/src/test/resources/tree-diffing/createMatching/06_gumtree_expected.lg
@@ -1,10 +1,13 @@
 v 80 NON;IF;(old: -1, diff: 0, new: -1);(old: -1, diff: 0, new: -1);True
-v 144 NON;IF;(old: 1, diff: 1, new: 1);(old: 4, diff: 1, new: 4);defined(A);#ifdef A
+v 136 REM;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 1, new: -1);defined(A);#ifdef A
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 2);(old: 3, diff: 2, new: 3);;Line A
 v 275 NON;ARTIFACT;(old: 3, diff: 3, new: 3);(old: 4, diff: 3, new: 4);;Line B
-v 322 ADD;ELIF;(old: -1, diff: 4, new: 3);(old: -1, diff: 4, new: 5);B;#elif B
-e 144 80 ba;0,0
-e 211 144 ba;0,0
-e 275 144 b;1,-1
-e 322 144 a;-1,1
-e 275 322 a;-1,0
+v 320 ADD;IF;(old: -1, diff: 4, new: 1);(old: -1, diff: 4, new: 3);defined(A);#ifdef A
+v 386 ADD;ELIF;(old: -1, diff: 5, new: 3);(old: -1, diff: 5, new: 5);B;#elif B
+e 136 80 b;0,-1
+e 320 80 a;-1,0
+e 211 136 b;0,-1
+e 275 136 b;1,-1
+e 211 320 a;-1,0
+e 386 320 a;-1,1
+e 275 386 a;-1,0
diff --git a/src/test/resources/tree-diffing/improveMatching/06_change-distiller_expected.lg b/src/test/resources/tree-diffing/improveMatching/06_change-distiller_expected.lg
@@ -1,10 +1,13 @@
 v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
-v 144 NON;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
+v 136 REM;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 2);(old: 3, diff: 3, new: 3);;Line A
 v 339 NON;ARTIFACT;(old: 3, diff: 4, new: 4);(old: 4, diff: 5, new: 5);;Line B
+v 128 ADD;IF;(old: -1, diff: 1, new: 1);(old: -1, diff: 5, new: 3);defined(A);#ifdef A
 v 258 ADD;ELIF;(old: -1, diff: 3, new: 3);(old: -1, diff: 6, new: 5);B;#elif B
-e 144 16 ba;0,0
-e 211 144 ba;0,0
-e 339 144 b;1,-1
-e 258 144 a;-1,1
+e 136 16 b;0,-1
+e 128 16 a;-1,0
+e 211 136 b;0,-1
+e 339 136 b;1,-1
+e 211 128 a;-1,0
+e 258 128 a;-1,1
 e 339 258 a;-1,0
diff --git a/src/test/resources/tree-diffing/improveMatching/06_gumtree-hybrid-id_expected.lg b/src/test/resources/tree-diffing/improveMatching/06_gumtree-hybrid-id_expected.lg
@@ -1,10 +1,13 @@
 v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
-v 144 NON;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
+v 136 REM;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 2);(old: 3, diff: 3, new: 3);;Line A
 v 339 NON;ARTIFACT;(old: 3, diff: 4, new: 4);(old: 4, diff: 5, new: 5);;Line B
+v 128 ADD;IF;(old: -1, diff: 1, new: 1);(old: -1, diff: 5, new: 3);defined(A);#ifdef A
 v 258 ADD;ELIF;(old: -1, diff: 3, new: 3);(old: -1, diff: 6, new: 5);B;#elif B
-e 144 16 ba;0,0
-e 211 144 ba;0,0
-e 339 144 b;1,-1
-e 258 144 a;-1,1
+e 136 16 b;0,-1
+e 128 16 a;-1,0
+e 211 136 b;0,-1
+e 339 136 b;1,-1
+e 211 128 a;-1,0
+e 258 128 a;-1,1
 e 339 258 a;-1,0
diff --git a/src/test/resources/tree-diffing/improveMatching/06_gumtree-hybrid_expected.lg b/src/test/resources/tree-diffing/improveMatching/06_gumtree-hybrid_expected.lg
@@ -1,10 +1,13 @@
 v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
-v 144 NON;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
+v 136 REM;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 2);(old: 3, diff: 3, new: 3);;Line A
 v 339 NON;ARTIFACT;(old: 3, diff: 4, new: 4);(old: 4, diff: 5, new: 5);;Line B
+v 128 ADD;IF;(old: -1, diff: 1, new: 1);(old: -1, diff: 5, new: 3);defined(A);#ifdef A
 v 258 ADD;ELIF;(old: -1, diff: 3, new: 3);(old: -1, diff: 6, new: 5);B;#elif B
-e 144 16 ba;0,0
-e 211 144 ba;0,0
-e 339 144 b;1,-1
-e 258 144 a;-1,1
+e 136 16 b;0,-1
+e 128 16 a;-1,0
+e 211 136 b;0,-1
+e 339 136 b;1,-1
+e 211 128 a;-1,0
+e 258 128 a;-1,1
 e 339 258 a;-1,0
diff --git a/src/test/resources/tree-diffing/improveMatching/06_gumtree-partition-id_expected.lg b/src/test/resources/tree-diffing/improveMatching/06_gumtree-partition-id_expected.lg
@@ -1,10 +1,13 @@
 v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
-v 144 NON;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
+v 136 REM;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 2);(old: 3, diff: 3, new: 3);;Line A
 v 339 NON;ARTIFACT;(old: 3, diff: 4, new: 4);(old: 4, diff: 5, new: 5);;Line B
+v 128 ADD;IF;(old: -1, diff: 1, new: 1);(old: -1, diff: 5, new: 3);defined(A);#ifdef A
 v 258 ADD;ELIF;(old: -1, diff: 3, new: 3);(old: -1, diff: 6, new: 5);B;#elif B
-e 144 16 ba;0,0
-e 211 144 ba;0,0
-e 339 144 b;1,-1
-e 258 144 a;-1,1
+e 136 16 b;0,-1
+e 128 16 a;-1,0
+e 211 136 b;0,-1
+e 339 136 b;1,-1
+e 211 128 a;-1,0
+e 258 128 a;-1,1
 e 339 258 a;-1,0
diff --git a/src/test/resources/tree-diffing/improveMatching/06_gumtree-simple-id_expected.lg b/src/test/resources/tree-diffing/improveMatching/06_gumtree-simple-id_expected.lg
@@ -1,10 +1,13 @@
 v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
-v 144 NON;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
+v 136 REM;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 2);(old: 3, diff: 3, new: 3);;Line A
 v 339 NON;ARTIFACT;(old: 3, diff: 4, new: 4);(old: 4, diff: 5, new: 5);;Line B
+v 128 ADD;IF;(old: -1, diff: 1, new: 1);(old: -1, diff: 5, new: 3);defined(A);#ifdef A
 v 258 ADD;ELIF;(old: -1, diff: 3, new: 3);(old: -1, diff: 6, new: 5);B;#elif B
-e 144 16 ba;0,0
-e 211 144 ba;0,0
-e 339 144 b;1,-1
-e 258 144 a;-1,1
+e 136 16 b;0,-1
+e 128 16 a;-1,0
+e 211 136 b;0,-1
+e 339 136 b;1,-1
+e 211 128 a;-1,0
+e 258 128 a;-1,1
 e 339 258 a;-1,0
diff --git a/src/test/resources/tree-diffing/improveMatching/06_gumtree-simple_expected.lg b/src/test/resources/tree-diffing/improveMatching/06_gumtree-simple_expected.lg
@@ -1,10 +1,13 @@
 v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
-v 144 NON;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
+v 136 REM;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 2);(old: 3, diff: 3, new: 3);;Line A
 v 339 NON;ARTIFACT;(old: 3, diff: 4, new: 4);(old: 4, diff: 5, new: 5);;Line B
+v 128 ADD;IF;(old: -1, diff: 1, new: 1);(old: -1, diff: 5, new: 3);defined(A);#ifdef A
 v 258 ADD;ELIF;(old: -1, diff: 3, new: 3);(old: -1, diff: 6, new: 5);B;#elif B
-e 144 16 ba;0,0
-e 211 144 ba;0,0
-e 339 144 b;1,-1
-e 258 144 a;-1,1
+e 136 16 b;0,-1
+e 128 16 a;-1,0
+e 211 136 b;0,-1
+e 339 136 b;1,-1
+e 211 128 a;-1,0
+e 258 128 a;-1,1
 e 339 258 a;-1,0
diff --git a/src/test/resources/tree-diffing/improveMatching/06_gumtree_expected.lg b/src/test/resources/tree-diffing/improveMatching/06_gumtree_expected.lg
@@ -1,10 +1,13 @@
 v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
-v 144 NON;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
+v 136 REM;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 2);(old: 3, diff: 3, new: 3);;Line A
 v 339 NON;ARTIFACT;(old: 3, diff: 4, new: 4);(old: 4, diff: 5, new: 5);;Line B
+v 128 ADD;IF;(old: -1, diff: 1, new: 1);(old: -1, diff: 5, new: 3);defined(A);#ifdef A
 v 258 ADD;ELIF;(old: -1, diff: 3, new: 3);(old: -1, diff: 6, new: 5);B;#elif B
-e 144 16 ba;0,0
-e 211 144 ba;0,0
-e 339 144 b;1,-1
-e 258 144 a;-1,1
+e 136 16 b;0,-1
+e 128 16 a;-1,0
+e 211 136 b;0,-1
+e 339 136 b;1,-1
+e 211 128 a;-1,0
+e 258 128 a;-1,1
 e 339 258 a;-1,0
diff --git a/src/test/resources/tree-diffing/improveMatching/06_longestCommonSequence_expected.lg b/src/test/resources/tree-diffing/improveMatching/06_longestCommonSequence_expected.lg
@@ -1,10 +1,13 @@
 v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
-v 144 NON;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
+v 136 REM;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 2);(old: 3, diff: 3, new: 3);;Line A
 v 339 NON;ARTIFACT;(old: 3, diff: 4, new: 4);(old: 4, diff: 5, new: 5);;Line B
+v 128 ADD;IF;(old: -1, diff: 1, new: 1);(old: -1, diff: 5, new: 3);defined(A);#ifdef A
 v 258 ADD;ELIF;(old: -1, diff: 3, new: 3);(old: -1, diff: 6, new: 5);B;#elif B
-e 144 16 ba;0,0
-e 211 144 ba;0,0
-e 339 144 b;1,-1
-e 258 144 a;-1,1
+e 136 16 b;0,-1
+e 128 16 a;-1,0
+e 211 136 b;0,-1
+e 339 136 b;1,-1
+e 211 128 a;-1,0
+e 258 128 a;-1,1
 e 339 258 a;-1,0
diff --git a/src/test/resources/tree-diffing/improveMatching/06_xy_expected.lg b/src/test/resources/tree-diffing/improveMatching/06_xy_expected.lg
@@ -1,10 +1,13 @@
 v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
-v 144 NON;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
+v 136 REM;IF;(old: 1, diff: 1, new: -1);(old: 4, diff: 5, new: -1);defined(A);#ifdef A
 v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 2);(old: 3, diff: 3, new: 3);;Line A
 v 339 NON;ARTIFACT;(old: 3, diff: 4, new: 4);(old: 4, diff: 5, new: 5);;Line B
+v 128 ADD;IF;(old: -1, diff: 1, new: 1);(old: -1, diff: 5, new: 3);defined(A);#ifdef A
 v 258 ADD;ELIF;(old: -1, diff: 3, new: 3);(old: -1, diff: 6, new: 5);B;#elif B
-e 144 16 ba;0,0
-e 211 144 ba;0,0
-e 339 144 b;1,-1
-e 258 144 a;-1,1
+e 136 16 b;0,-1
+e 128 16 a;-1,0
+e 211 136 b;0,-1
+e 339 136 b;1,-1
+e 211 128 a;-1,0
+e 258 128 a;-1,1
 e 339 258 a;-1,0

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,11 @@ public static <L extends Label> DiffNode<L> improveMatching(DiffNode<L> tree, Ma`
`217`	`217`	`afterNode.split(BEFORE);`
`218`	`218`	`}`
`219`	`219`
`220`		`- beforeNode.join(afterNode, (beforeLabel, afterLabel) -> beforeLabel);`
	`220`	`+ beforeNode.join(afterNode, (beforeLabel, afterLabel) -> {`
	`221`	`+ Assert.assertEquals(beforeLabel.getLines(), afterLabel.getLines());`
	`222`	`+ Assert.assertEquals(beforeLabel.getTrailingLines(), afterLabel.getTrailingLines());`
	`223`	`+ return beforeLabel;`
	`224`	`+ });`
`221`	`225`	`}`
`222`	`226`
`223`	`227`	`Assert.assertTrue(beforeNode.isNon());`