refactor: make implicit logic explicit

AlexanderSchultheiss · AlexanderSchultheiss · commit c92a438f9189 · 2023-11-06T20:05:19.000+01:00
diff --git a/src/main/java/org/variantsync/vevos/extraction/analysis/VariabilityAnalysis.java b/src/main/java/org/variantsync/vevos/extraction/analysis/VariabilityAnalysis.java
@@ -72,7 +72,7 @@ static void analyzeNode(FileGT.Mutable fileGT, DiffNode<DiffLinesLabel> node, Ti
 
         for (int lineNumber = fromLine; lineNumber < toLine; lineNumber++) {
             LineAnnotation existingAnnotation = fileGT.get(lineNumber - 1);
-            if (existingAnnotation != null && existingAnnotation.nodeType().equals("artifact")) {
+            if (existingAnnotation != null && existingAnnotation.nodeType().equals("artifact") && node.isAnnotation()) {
                 // Never overwrite artifact pcs with annotation pcs
                 continue;
             }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ static void analyzeNode(FileGT.Mutable fileGT, DiffNode<DiffLinesLabel> node, Ti`
`72`	`72`
`73`	`73`	`for (int lineNumber = fromLine; lineNumber < toLine; lineNumber++) {`
`74`	`74`	`LineAnnotation existingAnnotation = fileGT.get(lineNumber - 1);`
`75`		`- if (existingAnnotation != null && existingAnnotation.nodeType().equals("artifact")) {`
	`75`	`+ if (existingAnnotation != null && existingAnnotation.nodeType().equals("artifact") && node.isAnnotation()) {`
`76`	`76`	`// Never overwrite artifact pcs with annotation pcs`
`77`	`77`	`continue;`
`78`	`78`	`}`