ASTDiff: Fixes #967

Author: pouryafard75

src/main/java/org/refactoringminer/astDiff/matchers/wrappers/BodyMapperMatcher.java

@@ -63,8 +63,6 @@ else if (abstractCodeMapping instanceof CompositeStatementObjectMapping)
             new JavaDocMatcher(optimizationData, bodyMapper.getContainer1().getJavadoc(), bodyMapper.getContainer2().getJavadoc(), bodyMapper.getJavadocDiff()).match(srcTree,dstTree,mappingStore);
         new CommentMatcher(optimizationData, bodyMapper.getCommentListDiff()).match(srcTree,dstTree,mappingStore);
 
-//        new RefactoringMatcher(optimizationData, new ArrayList<>(bodyMapper.getRefactoringsAfterPostProcessing())).
-//                matchAndUpdateOptimizationStore(srcTree, dstTree, mappingStore);
     }
 
     private void processCompositeMapping(Tree srcTree, Tree dstTree, AbstractCodeMapping abstractCodeMapping, ExtendedMultiMappingStore mappingStore) {

src/main/java/org/refactoringminer/astDiff/matchers/wrappers/FieldDeclarationByAttrDiffMatcher.java

@@ -28,6 +28,7 @@ private void processFieldDeclarationByAttrDiff(Tree srcTree, Tree dstTree, UMLAt
         if (umlAttributeDiff.getInitializerMapper().isPresent()) {
             UMLOperationBodyMapper umlOperationBodyMapper = umlAttributeDiff.getInitializerMapper().get();
             new MethodMatcher(optimizationData, umlOperationBodyMapper).match(srcTree, dstTree, mappingStore);
+            //TODO: if its a moved process its refactoring
         }
     }
 }

src/main/java/org/refactoringminer/astDiff/matchers/wrappers/MethodMatcher.java

@@ -21,6 +21,12 @@
 public class MethodMatcher extends BodyMapperMatcher{
 
     private static final String THROWS_KEYWORD_LABEL = "throws";
+    private boolean refactoringProcessor = false;
+
+    public MethodMatcher(UMLOperationBodyMapper bodyMapper, boolean isPartOfExtractMethod, boolean refactoringProcessor) {
+        super(bodyMapper, isPartOfExtractMethod);
+        this.refactoringProcessor = refactoringProcessor;
+    }
 
     public MethodMatcher(UMLOperationBodyMapper bodyMapper, boolean isPartOfExtractMethod) {
         super(bodyMapper, isPartOfExtractMethod);
@@ -78,6 +84,10 @@ private void processMethod(Tree srcTree, Tree dstTree, UMLOperationBodyMapper um
             new BodyMapperMatcher(optimizationData, umlOperationBodyMapper, isPartOfExtractedMethod).match(srcOperationNode, dstOperationNode, mappingStore);
             processOperationDiff(srcOperationNode, dstOperationNode, umlOperationBodyMapper, mappingStore);
             processMethodParameters(srcOperationNode, dstOperationNode, umlOperationBodyMapper.getMatchedVariables(), mappingStore);
+            if (refactoringProcessor){
+                new RefactoringMatcher(optimizationData, new ArrayList<>(bodyMapper.getRefactoringsAfterPostProcessing())).
+                        matchAndUpdateOptimizationStore(srcTree, dstTree, mappingStore);
+            }
         }
     }
 

src/main/java/org/refactoringminer/astDiff/matchers/wrappers/RefactoringMatcher.java

@@ -223,11 +223,10 @@ else if (refactoring instanceof RenameVariableRefactoring) {
                         break;
                     case RENAME_PARAMETER:
                         eligible = !renameVariableRefactoring.isInsideExtractedOrInlinedMethod();
-//                        for (AbstractCodeMapping abstractCodeMapping : renameVariableRefactoring.getReferences()) {
-//                            if (abstractCodeMapping instanceof LeafMapping) {
-//                                findVariablesAndMatch(TreeUtilFunctions.findByLocationInfo(srcTree, abstractCodeMapping.getFragment1().getLocationInfo()), TreeUtilFunctions.findByLocationInfo(dstTree, abstractCodeMapping.getFragment2().getLocationInfo()), renameVariableRefactoring.getOriginalVariable().getVariableName(), renameVariableRefactoring.getRenamedVariable().getVariableName());
-//                            }
-//                        }
+                        if (eligible)
+                            for (AbstractCodeMapping abstractCodeMapping : renameVariableRefactoring.getReferences())
+                                if (abstractCodeMapping instanceof LeafMapping)
+                                    findVariablesAndMatch(TreeUtilFunctions.findByLocationInfo(srcTree, abstractCodeMapping.getFragment1().getLocationInfo()), TreeUtilFunctions.findByLocationInfo(dstTree, abstractCodeMapping.getFragment2().getLocationInfo()), renameVariableRefactoring.getOriginalVariable().getVariableName(), renameVariableRefactoring.getRenamedVariable().getVariableName());
                         break;
                     case RENAME_VARIABLE:
                         Set<AbstractCodeMapping> references = renameVariableRefactoring.getReferences();
@@ -389,16 +388,16 @@ private void findVariablesAndMatch(Tree srcStatement, Tree dstStatement, String
                 }
             }
             else {
-//                //find the ones with the same parent type and match em
-//                for (Tree srcRef : srcRefs) {
-//                    for (Tree dstRef : dstRefs) {
-//                        if (srcRef.getParent() != null && dstRef.getParent() != null &&
-//                                srcRef.getParent().getType().name.equals(dstRef.getParent().getType().name)) {
-//                            optimizationData.getSubtreeMappings().addMapping(srcRef, dstRef);
-//                            break;
-//                        }
-//                    }
-//                }
+                //TODO: Begin with the one with fewer occurrences, find the match with the exact same parent type
+                for (Tree srcRef : srcRefs) {
+                    for (Tree dstRef : dstRefs) {
+                        if (srcRef.getParent() != null && dstRef.getParent() != null &&
+                                srcRef.getParent().getType().name.equals(dstRef.getParent().getType().name)) {
+                            optimizationData.getSubtreeMappings().addMapping(srcRef, dstRef);
+                            break;
+                        }
+                    }
+                }
 
             }
         }

src/main/java/org/refactoringminer/astDiff/matchers/wrappers/UnifiedModelDiffRefactoringsMatcher.java

@@ -85,7 +85,7 @@ private void processModeldiffRefactorings() {
 //                if (isExtractedMethodRef(moveOperationRefactoring.getBodyMapper().getOperation2())) continue;
                 String srcPath = moveOperationRefactoring.getOriginalOperation().getLocationInfo().getFilePath();
                 String dstPath = moveOperationRefactoring.getMovedOperation().getLocationInfo().getFilePath();
-                findDiffsAndApplyMatcher(srcPath, dstPath, new MethodMatcher(moveOperationRefactoring.getBodyMapper(), true));
+                findDiffsAndApplyMatcher(srcPath, dstPath, new MethodMatcher(moveOperationRefactoring.getBodyMapper(), true, true));
                 if (moveOperationRefactoring.getOriginalOperation().getJavadoc() == null && moveOperationRefactoring.getMovedOperation().getJavadoc() != null) {
                     UMLClass originalClass = modelDiff.getRemovedClass(moveOperationRefactoring.getOriginalOperation().getClassName());
                     if (originalClass != null && originalClass.getJavadoc() != null) {

src/main/java/org/refactoringminer/astDiff/models/ExtendedMultiMappingStore.java

@@ -8,6 +8,8 @@
 import com.github.gumtreediff.tree.FakeTree;
 import com.github.gumtreediff.tree.Tree;
 import com.github.gumtreediff.utils.Pair;
+import org.refactoringminer.astDiff.utils.Constants;
+import org.refactoringminer.astDiff.utils.TreeUtilFunctions;
 
 /**
  * @author  Pourya Alikhani Fard [email protected]
@@ -236,18 +238,28 @@ public void replaceWithOptimizedMappings(ExtendedMultiMappingStore optimizationM
 			if (this.getDsts(srcMapped) != null)
 			{
 				Set<Tree> dstForSrcList = new LinkedHashSet<>(this.getDsts(srcMapped));
-				for (Tree dstForSrc : dstForSrcList)
-					removeMapping(srcMapped,dstForSrc);
+				for (Tree dstForSrc : dstForSrcList) {
+                    if (sameFile(dstMapped, dstForSrc))
+                        removeMapping(srcMapped, dstForSrc);
+                }
 			}
 			if (this.getSrcs(dstMapped) != null)
 			{
 				Set<Tree> srcForDstList = new LinkedHashSet<>(this.getSrcs(dstMapped));
 				for (Tree srcForDst : srcForDstList)
-					removeMapping(srcForDst,dstMapped);
+                    if (sameFile(srcMapped, srcForDst))
+					    removeMapping(srcForDst,dstMapped);
 			}
 		}
 		for (Mapping optimizationMapping : optimizationMappings) {
 			this.addMapping(optimizationMapping.first,optimizationMapping.second);
 		}
 	}
+
+    private boolean sameFile(Tree t1, Tree t2) {
+        // find the most parent of both, and compare
+        Tree t1_p = TreeUtilFunctions.getParentUntilType(t1, Constants.COMPILATION_UNIT);
+        Tree t2_p = TreeUtilFunctions.getParentUntilType(t2, Constants.COMPILATION_UNIT);
+        return Objects.equals(t1_p, t2_p);
+    }
 }