fix: Add id attribute in node

Cargo.toml

@@ -11,3 +11,4 @@ members = [
 
 [workspace.dependencies]
 log = "0.4.20"
+uuid = { version = "1.7.0", features = ["v4"] }

bin/tests/scenarios/imports_are_merged_correctly/base.java

@@ -1,2 +1,13 @@
+package de.fosd.jdime.merge;
+
+import java.util.List;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
+import de.fosd.jdime.operations.ConflictOperation;
+import de.fosd.jdime.operations.DeleteOperation;
+import de.fosd.jdime.operations.MergeOperation;
+
+import static de.fosd.jdime.artifact.Artifacts.root;
+import static de.fosd.jdime.strdump.DumpMode.PLAINTEXT_TREE;

bin/tests/scenarios/imports_are_merged_correctly/left.java

@@ -1,2 +1,11 @@
-import java.security.Permission;
-import java.util.Arrays;
+package de.fosd.jdime.merge;
+
+import java.util.List;
+import java.util.Objects;
+
+import de.fosd.jdime.operations.AddOperation;
+import de.fosd.jdime.operations.ConflictOperation;
+import de.fosd.jdime.operations.MergeOperation;
+
+import static de.fosd.jdime.artifact.Artifacts.root;
+import static de.fosd.jdime.strdump.DumpMode.PLAINTEXT_TREE;

bin/tests/scenarios/imports_are_merged_correctly/merge.java

@@ -1 +1 @@
-  import   java . security . Permission ;  import   java . util . Arrays ;  import    java . util . logging . Array ;
+  package    de . fosd . jdime . merge ;  import   java . util . List ;  import     de . fosd . jdime . operations . AddOperation ;  import     de . fosd . jdime . operations . ConflictOperation ;  import     de . fosd . jdime . operations . MergeOperation ;  import static      de . fosd . jdime . artifact . Artifacts . root ;  import static      de . fosd . jdime . strdump . DumpMode . PLAINTEXT_TREE ;

bin/tests/scenarios/imports_are_merged_correctly/right.java

@@ -1,3 +1,11 @@
-import java.security.Permission;
+package de.fosd.jdime.merge;
+
+import java.util.List;
 import java.util.logging.Logger;
-import java.util.logging.Array;
+
+import de.fosd.jdime.operations.AddOperation;
+import de.fosd.jdime.operations.ConflictOperation;
+import de.fosd.jdime.operations.MergeOperation;
+
+import static de.fosd.jdime.artifact.Artifacts.root;
+import static de.fosd.jdime.strdump.DumpMode.PLAINTEXT_TREE;

matching/Cargo.toml

@@ -10,3 +10,6 @@ model = { path = "../model" }
 matching_handlers = { path = "../matching_handlers" }
 unordered-pair = "0.2.4"
 log = { workspace = true }
+
+[dev-dependencies]
+uuid = { workspace = true }

matching/src/lib.rs

@@ -41,10 +41,10 @@ pub fn calculate_matchings<'a>(
                 ..
             }),
         ) => {
-            let is_perfetch_match = kind_left == kind_right && value_left == value_right;
+            let is_perfect_match = kind_left == kind_right && value_left == value_right;
             Matchings::from_single(
                 UnorderedPair(left, right),
-                MatchingEntry::new(is_perfetch_match.into(), is_perfetch_match),
+                MatchingEntry::new(is_perfect_match.into(), is_perfect_match),
             )
         }
         (_, _) => Matchings::from_single(UnorderedPair(left, right), MatchingEntry::new(0, false)),
@@ -61,13 +61,15 @@ mod tests {
     #[test]
     fn two_terminal_nodes_matches_with_a_score_of_one_if_they_have_the_same_kind_and_value() {
         let left = CSTNode::Terminal(Terminal {
+            id: uuid::Uuid::new_v4(),
             kind: "kind",
             value: "value",
             start_position: Point { row: 0, column: 0 },
             end_position: Point { row: 0, column: 5 },
             is_block_end_delimiter: false,
         });
         let right = CSTNode::Terminal(Terminal {
+            id: uuid::Uuid::new_v4(),
             kind: "kind",
             value: "value",
             start_position: Point { row: 0, column: 0 },
@@ -87,13 +89,15 @@ mod tests {
     #[test]
     fn two_terminal_nodes_have_a_match_with_score_zero_if_they_have_different_value() {
         let left = CSTNode::Terminal(Terminal {
+            id: uuid::Uuid::new_v4(),
             kind: "kind",
             value: "value_a",
             start_position: Point { row: 0, column: 0 },
             end_position: Point { row: 0, column: 7 },
             is_block_end_delimiter: false,
         });
         let right = CSTNode::Terminal(Terminal {
+            id: uuid::Uuid::new_v4(),
             kind: "kind",
             value: "value_b",
             start_position: Point { row: 0, column: 0 },
@@ -113,13 +117,15 @@ mod tests {
     #[test]
     fn two_terminal_nodes_have_a_match_with_score_zero_if_they_have_different_kind() {
         let left = CSTNode::Terminal(Terminal {
+            id: uuid::Uuid::new_v4(),
             kind: "kind_a",
             value: "value",
             start_position: Point { row: 0, column: 0 },
             end_position: Point { row: 0, column: 5 },
             is_block_end_delimiter: false,
         });
         let right = CSTNode::Terminal(Terminal {
+            id: uuid::Uuid::new_v4(),
             kind: "kind_b",
             value: "value",
             start_position: Point { row: 0, column: 0 },
@@ -139,13 +145,15 @@ mod tests {
     #[test]
     fn two_terminal_nodes_have_a_match_with_score_zero_if_they_have_different_kind_and_value() {
         let left = CSTNode::Terminal(Terminal {
+            id: uuid::Uuid::new_v4(),
             kind: "kind_a",
             value: "value_a",
             start_position: Point { row: 0, column: 0 },
             end_position: Point { row: 0, column: 7 },
             is_block_end_delimiter: false,
         });
         let right = CSTNode::Terminal(Terminal {
+            id: uuid::Uuid::new_v4(),
             kind: "kind_b",
             value: "value_a",
             start_position: Point { row: 0, column: 0 },

matching/src/matchings.rs

@@ -31,9 +31,15 @@ impl<'a> Matchings<'a> {
     pub fn find_matching_for(&self, a_node: &'a CSTNode) -> Option<Matching> {
         self.matching_entries
             .iter()
-            .find(|(UnorderedPair(left, right), ..)| left == &a_node || right == &a_node)
+            .find(|(UnorderedPair(left, right), ..)| {
+                left.id() == a_node.id() || right.id() == a_node.id()
+            })
             .map(|(UnorderedPair(left, right), matching)| {
-                let matching_node = if left == &a_node { right } else { left };
+                let matching_node = if left.id() == a_node.id() {
+                    right
+                } else {
+                    left
+                };
                 Matching {
                     matching_node,
                     score: matching.score,
@@ -89,6 +95,7 @@ mod tests {
     #[test]
     fn returns_none_if_a_matching_for_the_node_is_not_found() {
         let a_node = CSTNode::Terminal(Terminal {
+            id: uuid::Uuid::new_v4(),
             kind: "kind",
             value: "value",
             start_position: Point { row: 0, column: 0 },
@@ -102,6 +109,7 @@ mod tests {
     #[test]
     fn returns_some_match_if_a_matching_for_the_node_is_found() {
         let a_node = CSTNode::Terminal(Terminal {
+            id: uuid::Uuid::new_v4(),
             kind: "kind",
             value: "value",
             start_position: Point { row: 0, column: 0 },