Skip to content

Commit f4e6850

Browse files
committed
fix: respect trailing lines when matching variation trees
1 parent 2b20e33 commit f4e6850

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

src/main/java/org/variantsync/diffdetective/gumtree/VariationTreeAdapter.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.LinkedHashMap;
66
import java.util.Map.Entry;
77
import java.util.stream.Collectors;
8+
import java.util.stream.Stream;
89

910
import org.variantsync.diffdetective.variation.Label;
1011
import org.variantsync.diffdetective.variation.tree.VariationNode;
@@ -34,7 +35,11 @@ public VariationTreeAdapter(VariationNode<?, L> node) {
3435
if (backingNode.isConditionalAnnotation()) {
3536
cachedLabel = backingNode.getFormula().toString();
3637
} else {
37-
cachedLabel = backingNode.getLabel().getLines().stream().collect(Collectors.joining("\n"));
38+
cachedLabel =
39+
Stream.concat(
40+
backingNode.getLabel().getLines().stream(),
41+
backingNode.getLabel().getTrailingLines().stream()
42+
).collect(Collectors.joining("\n"));
3843
}
3944

4045
var children = new ArrayList<Tree>(node.getChildren().size());

0 commit comments

Comments
 (0)