ASTDiff: Fix the editscript generation for extra diff

pouryafard75#105
tsantalis · May 29, 2024 · c09832f · c09832f
1 parent 3033085
commit c09832f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/org/refactoringminer/astDiff/matchers/ProjectASTDiffer.java b/src/main/java/org/refactoringminer/astDiff/matchers/ProjectASTDiffer.java
@@ -13,6 +13,7 @@
 import org.refactoringminer.api.Refactoring;
 import org.refactoringminer.api.RefactoringMinerTimedOutException;
 import org.refactoringminer.api.RefactoringType;
+import org.refactoringminer.astDiff.actions.editscript.SimplifiedExtendedChawatheScriptGenerator;
 import org.refactoringminer.astDiff.models.ExtendedMultiMappingStore;
 import org.refactoringminer.astDiff.models.OptimizationData;
 import org.refactoringminer.astDiff.moved.AllSubTreesMovedASTDiffGenerator;
@@ -145,9 +146,12 @@ else if(modelDiffRefactoring.getRefactoringType() == RefactoringType.MOVE_AND_RE
 				if (append != null)
 					append.getAllMappings().mergeMappings(mappingStore);
 				else {
+					mappingStore.addMapping(treeContextPair.first.getRoot(), treeContextPair.second.getRoot());
 					ASTDiff diff = new ASTDiff(srcPath, dstPath,
 							treeContextPair.first, treeContextPair.second,
-							mappingStore);
+							mappingStore,
+							new SimplifiedExtendedChawatheScriptGenerator().computeActions(mappingStore));
+					mappingStore.removeMapping(treeContextPair.first.getRoot(), treeContextPair.second.getRoot());
 					projectASTDiff.addMoveASTDiff(diff);
 				}
 			}