feat: set feature mapping and presence conditions of macro lines to false if PC changes are ignored

Author: AlexanderSchultheiss

src/main/java/org/variantsync/vevos/extraction/FileGT.java

@@ -17,9 +17,6 @@ public class FileGT implements Iterable<LineAnnotation>, Serializable {
     // i.e., the matching line numbers before or after the changes have been applied
     // a match is -1 if there is no counterpart
     protected final ArrayList<Integer> matching;
-    // Set of annotation block starts and ends
-    protected final HashSet<Integer> blockEnds;
-    protected final HashSet<Integer> blockStarts;
     // List of annotation for each line
     private final ArrayList<LineAnnotation> annotations;
     // The set of variables occurring in the annotations of this file
@@ -30,8 +27,6 @@ public class FileGT implements Iterable<LineAnnotation>, Serializable {
     protected FileGT(String file) {
         this.annotations = new ArrayList<>();
         this.matching = new ArrayList<>();
-        this.blockStarts = new HashSet<>();
-        this.blockEnds = new HashSet<>();
         this.consumed = false;
         this.file = file;
         this.variables = new HashSet<>();
@@ -40,8 +35,6 @@ protected FileGT(String file) {
     protected FileGT(FileGT other) {
         this.annotations = other.annotations;
         this.matching = other.matching;
-        this.blockStarts = other.blockStarts;
-        this.blockEnds = other.blockEnds;
         this.consumed = false;
         this.file = other.file;
         this.variables = other.variables;
@@ -206,13 +199,6 @@ public Complete finishMutation() {
             return new Complete(this);
         }
 
-        public void markBlockEnd(int lineNumber) {
-            this.blockEnds.add(lineNumber);
-        }
-
-        public void markBlockStart(int lineNumber) {
-            this.blockStarts.add(lineNumber);
-        }
     }
 
     /**

src/main/java/org/variantsync/vevos/extraction/PCAnalysis.java

@@ -59,9 +59,6 @@ static void analyzeNode(FileGT.Mutable fileGT, DiffNode<DiffLinesLabel> node, Ti
         int toLine = currentRange.toExclusive();
 
         if (node.isAnnotation()) {
-            // Mark the start and end of this annotation block
-            fileGT.markBlockStart(fromLine);
-            fileGT.markBlockEnd(toLine);
             // Grow the root mapping
             fileGT.growIfRequired(toLine);
         } else {
@@ -75,15 +72,25 @@ static void analyzeNode(FileGT.Mutable fileGT, DiffNode<DiffLinesLabel> node, Ti
             fileGT.setMatching(currentRange, counterpartRange);
         }
 
+        // Also consider the #endif in case of an annotation
+        toLine = (node.isAnnotation() && !node.isRoot()) ? toLine+1 : toLine;
         for (int lineNumber = fromLine; lineNumber < toLine; lineNumber++) {
             LineAnnotation existingAnnotation = fileGT.get(lineNumber - 1);
             if (existingAnnotation != null && existingAnnotation.nodeType().equals("artifact")) {
                 // Never overwrite artifact pcs with annotation pcs
                 continue;
             }
-            LineAnnotation annotation = new LineAnnotation(lineNumber,
-                    new FeatureMapping(featureMapping.toString()), new PresenceCondition(presenceCondition.toString()),
-                    node.getNodeType().name, presenceCondition.getUniqueContainedFeatures());
+            LineAnnotation annotation;
+            if (node.isAnnotation() && ignorePCChanges) {
+                // We set the PC and Mapping of all macro lines to '0', i.e., 'false
+                annotation = new LineAnnotation(lineNumber,
+                        new FeatureMapping("0"), new PresenceCondition("0"),
+                        node.getNodeType().name, presenceCondition.getUniqueContainedFeatures());
+            } else {
+                annotation = new LineAnnotation(lineNumber,
+                        new FeatureMapping(featureMapping.toString()), new PresenceCondition(presenceCondition.toString()),
+                        node.getNodeType().name, presenceCondition.getUniqueContainedFeatures());
+            }
             fileGT.insert(annotation);
         }
     }