ASTDiff: Fix the issue related to the comments offset

Author: pouryafard75

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

@@ -8,6 +8,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.refactoringminer.astDiff.models.ExtendedMultiMappingStore;
 import org.refactoringminer.astDiff.models.OptimizationData;
+import org.refactoringminer.astDiff.utils.Constants;
 import org.refactoringminer.astDiff.utils.TreeUtilFunctions;
 
 import java.util.Optional;
@@ -37,8 +38,8 @@ void matchAndUpdateOptimizationStore(Tree src, Tree dst, ExtendedMultiMappingSto
                             matchAndUpdateOptimizationStore(src, dst, mappingStore);
                 }
                 else {
-                    Tree srcComment = TreeUtilFunctions.findByLocationInfo(src, commonComment.getLeft().getLocationInfo());
-                    Tree dstComment = TreeUtilFunctions.findByLocationInfo(dst, commonComment.getRight().getLocationInfo());
+                    Tree srcComment = TreeUtilFunctions.findByLocationInfo(src, commonComment.getLeft().getLocationInfo(), Constants.LINE_COMMENT, Constants.BLOCK_COMMENT);
+                    Tree dstComment = TreeUtilFunctions.findByLocationInfo(dst, commonComment.getRight().getLocationInfo(), Constants.LINE_COMMENT, Constants.BLOCK_COMMENT);
                     if (srcComment != null && dstComment != null) {
                         mappingStore.addMapping(srcComment, dstComment);
                     }

src/main/java/org/refactoringminer/astDiff/utils/TreeUtilFunctions.java

@@ -57,7 +57,7 @@ public static Tree findByLocationInfoNoLookAhead(Tree tree, LocationInfo locatio
 		return treeBetweenPositions;
 	}
 
-	public static Tree findByLocationInfo(Tree tree, LocationInfo locationInfo, String type){
+	public static Tree findByLocationInfo(Tree tree, LocationInfo locationInfo, String... type){
 		int startoffset = locationInfo.getStartOffset();
 		int endoffset = locationInfo.getEndOffset();
 		return getTreeBetweenPositions(tree, startoffset, endoffset,type);
@@ -71,7 +71,7 @@ public static Tree getTreeBetweenPositions(Tree tree, int position, int endPosit
 		return null;
 	}
 
-	public static Tree getTreeBetweenPositions(Tree tree, int position, int endPosition,String type) {
+	public static Tree getTreeBetweenPositions(Tree tree, int position, int endPosition,String... type) {
 		for (Tree t: tree.preOrder()) {
 			if (t.getPos() >= position && t.getEndPos() <= endPosition)
 				if (isFromType(t, type))
@@ -301,8 +301,12 @@ public static boolean areBothFromThisType(Tree t1, Tree t2, String type) {
 				&& isFromType(t2, type);
 	}
 
-	public static boolean isFromType(Tree t1, String type) {
-		return t1.getType().name.equals(type);
+	public static boolean isFromType(Tree t1, String... type) {
+        if (t1 == null) return false;
+        for (String t: type)
+		    if (t1.getType().name.equals(t))
+                return true;
+        return false;
 	}
 
 	public static Tree findFirstByType(Tree inputTree, String typeName) {