ASTDiff: Fixes the annotation processor

Author: pouryafard75

src/main/java/org/refactoringminer/astDiff/matchers/statement/IgnoringCommentsLeafMatcher.java

@@ -0,0 +1,29 @@
+package org.refactoringminer.astDiff.matchers.statement;
+
+import com.github.gumtreediff.matchers.Mapping;
+import com.github.gumtreediff.tree.Tree;
+import org.refactoringminer.astDiff.models.ExtendedMultiMappingStore;
+import org.refactoringminer.astDiff.utils.Constants;
+import org.refactoringminer.astDiff.utils.TreeUtilFunctions;
+
+public class IgnoringCommentsLeafMatcher extends LeafMatcher {
+    @Override
+    public void match(Tree src, Tree dst, ExtendedMultiMappingStore mappingStore) {
+        ExtendedMultiMappingStore newMappings = new ExtendedMultiMappingStore(src, dst);
+        super.match(src, dst, newMappings);
+        // Remove comment mappings from the mapping store
+        for (Mapping newMapping : newMappings) {
+            if (isPartOfComments(newMapping.first) || isPartOfComments(newMapping.second)) {
+                newMappings.removeMapping(newMapping.first, newMapping.second);
+            }
+        }
+        for (Mapping newMapping : newMappings) {
+            mappingStore.addMapping(newMapping.first, newMapping.second);
+        }
+    }
+    public static boolean isPartOfComments(Tree tree) {
+        return TreeUtilFunctions.getParentUntilType(tree, Constants.LINE_COMMENT) != null ||
+               TreeUtilFunctions.getParentUntilType(tree, Constants.JAVA_DOC) != null ||
+               TreeUtilFunctions.getParentUntilType(tree, Constants.BLOCK_COMMENT) != null;
+    }
+}

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

@@ -7,10 +7,10 @@
 import gr.uom.java.xmi.diff.UMLOperationDiff;
 import gr.uom.java.xmi.diff.UMLTypeParameterListDiff;
 import org.apache.commons.lang3.tuple.Pair;
+import org.refactoringminer.astDiff.matchers.statement.IgnoringCommentsLeafMatcher;
 import org.refactoringminer.astDiff.models.ExtendedMultiMappingStore;
 import org.refactoringminer.astDiff.models.OptimizationData;
 import org.refactoringminer.astDiff.utils.Constants;
-import org.refactoringminer.astDiff.matchers.statement.BasicTreeMatcher;
 import org.refactoringminer.astDiff.matchers.statement.LeafMatcher;
 import org.refactoringminer.astDiff.utils.Helpers;
 import org.refactoringminer.astDiff.utils.TreeUtilFunctions;
@@ -139,7 +139,12 @@ private void processOperationDiff(Tree srcTree, Tree dstTree, UMLOperationBodyMa
         for (org.apache.commons.lang3.tuple.Pair<UMLAnnotation, UMLAnnotation>  umlAnnotationUMLAnnotationPair : umlOperationDiff.getAnnotationListDiff().getCommonAnnotations()) {
             Tree srcClassAnnotationTree = TreeUtilFunctions.findByLocationInfo(srcTree , umlAnnotationUMLAnnotationPair.getLeft().getLocationInfo());
             Tree dstClassAnnotationTree = TreeUtilFunctions.findByLocationInfo(dstTree, umlAnnotationUMLAnnotationPair.getRight().getLocationInfo());
-            mappingStore.addMappingRecursively(srcClassAnnotationTree,dstClassAnnotationTree);
+            if (srcClassAnnotationTree == null || dstClassAnnotationTree == null) continue;
+            if (srcClassAnnotationTree.isIsoStructuralTo(dstClassAnnotationTree))
+                mappingStore.addMappingRecursively(srcClassAnnotationTree, dstClassAnnotationTree);
+            else {
+                new IgnoringCommentsLeafMatcher().match(srcClassAnnotationTree, dstClassAnnotationTree, mappingStore);
+            }
         }
         Set<org.apache.commons.lang3.tuple.Pair<UMLType, UMLType>> commonExceptionTypes = umlOperationDiff.getCommonExceptionTypes();
         new KeywordMatcher(Constants.THROWS_KEYWORD, THROWS_KEYWORD_LABEL).match(srcTree, dstTree, mappingStore);