Fix comment mappings for commit

brianfrankcooper/YCSB@0b02483
tsantalis · Dec 4, 2024 · 4b658cb · 4b658cb
1 parent 90da06f
commit 4b658cb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/main/java/gr/uom/java/xmi/UMLComment.java b/src/main/java/gr/uom/java/xmi/UMLComment.java
@@ -5,6 +5,7 @@
 
 import gr.uom.java.xmi.LocationInfo.CodeElementType;
 import gr.uom.java.xmi.decomposition.CompositeStatementObject;
+import gr.uom.java.xmi.decomposition.TryStatementObject;
 
 import static gr.uom.java.xmi.Constants.JAVA;
 
@@ -94,4 +95,19 @@ public boolean isCommentedCode() {
 		}
 		return false;
 	}
+
+	public boolean nestedInCatchBlock() {
+		if(parent != null && parent.getLocationInfo().getCodeElementType().equals(CodeElementType.TRY_STATEMENT)) {
+			TryStatementObject tryParent = (TryStatementObject)parent;
+			for(CompositeStatementObject catchClause : tryParent.getCatchClauses()) {
+				if(catchClause.getLocationInfo().subsumes(this.getLocationInfo()))
+					return true;
+			}
+			if(tryParent.getFinallyClause() != null) {
+				if(tryParent.getFinallyClause().getLocationInfo().subsumes(this.getLocationInfo()))
+					return true;
+			}
+		}
+		return false;
+	}
 }
diff --git a/src/main/java/gr/uom/java/xmi/diff/UMLCommentListDiff.java b/src/main/java/gr/uom/java/xmi/diff/UMLCommentListDiff.java
@@ -213,7 +213,7 @@ private void processRemainingComments(List<UMLComment> commentsBefore, List<UMLC
 				for(Pair<UMLComment, UMLComment> pair : commonComments) {
 					if(pair.getLeft().getText().equals(deletedComment.getText()) &&
 							pair.getRight().getText().equals(deletedComment.getText()) &&
-							!deletedComment.isCommentedCode()) {
+							!deletedComment.isCommentedCode() && !deletedComment.nestedInCatchBlock()) {
 						Pair<UMLComment, UMLComment> newPair = Pair.of(deletedComment, pair.getRight());
 						commonComments.add(newPair);
 						deletedComments.remove(deletedComment);
@@ -228,7 +228,7 @@ private void processRemainingComments(List<UMLComment> commentsBefore, List<UMLC
 				for(Pair<UMLComment, UMLComment> pair : commonComments) {
 					if(pair.getLeft().getText().equals(addedComment.getText()) &&
 							pair.getRight().getText().equals(addedComment.getText()) &&
-							!addedComment.isCommentedCode()) {
+							!addedComment.isCommentedCode() && !addedComment.nestedInCatchBlock()) {
 						Pair<UMLComment, UMLComment> newPair = Pair.of(pair.getLeft(), addedComment);
 						commonComments.add(newPair);
 						addedComments.remove(addedComment);