Fix lambda mappers in commit

apache/lucene-solr@34993c2
lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/GeneratingSuggester.java

Author: tsantalis

src/main/java/gr/uom/java/xmi/decomposition/ReplacementAlgorithm.java

@@ -26,6 +26,7 @@
 import gr.uom.java.xmi.UMLAnonymousClass;
 import gr.uom.java.xmi.UMLAttribute;
 import gr.uom.java.xmi.UMLClass;
+import gr.uom.java.xmi.UMLComment;
 import gr.uom.java.xmi.UMLOperation;
 import gr.uom.java.xmi.UMLParameter;
 import gr.uom.java.xmi.UMLType;
@@ -5876,7 +5877,44 @@ protected static void processLambdas(LambdaExpressionObject lambda1, LambdaExpre
 			else if(invocations1.size() == 0 && invocations2.size() > 0) {
 				nonMappedElementsT1 = nonMappedElementsT1 - ignoredNonMappedElements(invocations2, mapper.getNonMappedLeavesT1(), mapper.getNonMappedInnerNodesT1());
 			}
-			if((mappings >= nonMappedElementsT1 && mappings >= nonMappedElementsT2) ||
+			AbstractCodeFragment parentStatement1 = null;
+			if(operationBodyMapper.getContainer1().getBody() != null) {
+				for(AbstractCodeFragment leaf1 : operationBodyMapper.getContainer1().getBody().getCompositeStatement().getLeaves()) {
+					if(leaf1.getLocationInfo().subsumes(lambda1.getLocationInfo())) {
+						parentStatement1 = leaf1;
+						break;
+					}
+				}
+			}
+			AbstractCodeFragment parentStatement2 = null;
+			if(operationBodyMapper.getContainer2().getBody() != null) {
+				for(AbstractCodeFragment leaf2 : operationBodyMapper.getContainer2().getBody().getCompositeStatement().getLeaves()) {
+					if(leaf2.getLocationInfo().subsumes(lambda2.getLocationInfo())) {
+						parentStatement2 = leaf2;
+						break;
+					}
+				}
+			}
+			UMLComment previousComment1 = null;
+			if(parentStatement1 != null) {
+				for(UMLComment comment : operationBodyMapper.getContainer1().getComments()) {
+					if(parentStatement1.getLocationInfo().nextLine(comment.getLocationInfo())) {
+						previousComment1 = comment;
+						break;
+					}
+				}
+			}
+			UMLComment previousComment2 = null;
+			if(parentStatement2 != null) {
+				for(UMLComment comment : operationBodyMapper.getContainer2().getComments()) {
+					if(parentStatement2.getLocationInfo().nextLine(comment.getLocationInfo())) {
+						previousComment2 = comment;
+						break;
+					}
+				}
+			}
+			boolean identicalPreviousComment = previousComment1 != null && previousComment2 != null && previousComment1.getText().equals(previousComment2.getText());
+			if((mappings >= nonMappedElementsT1 && mappings >= nonMappedElementsT2) || identicalPreviousComment ||
 					(nonMappedElementsT1 == 0 && !methodReference1) || (nonMappedElementsT2 == 0 && !methodReference2) ||
 					(classDiff != null && (classDiff.isPartOfMethodExtracted(lambda1, lambda2) || classDiff.isPartOfMethodInlined(lambda1, lambda2) || isPartOfLambdaMovedToParentMapper(mapper)))) {
 				operationBodyMapper.addAllMappings(mapper.getMappings());

src/main/java/gr/uom/java/xmi/decomposition/VariableReplacementAnalysis.java

@@ -2352,6 +2352,18 @@ private boolean replacementNotInsideMethodSignatureOfAnonymousClass(AbstractCode
 			}
 			return replacementBeforeNotFoundInMethodSignature && replacementAfterNotFoundInMethodSignature;
 		}
+		for(UMLOperationBodyMapper lambdaMapper : mapping.getLambdaMappers()) {
+			if(lambdaMapper.getOperationSignatureDiff().isPresent()) {
+				UMLOperationDiff signatureDiff = lambdaMapper.getOperationSignatureDiff().get();
+				List<String> parameterNameList1 = signatureDiff.getRemovedOperation().getParameterNameList();
+				int index1 = parameterNameList1.indexOf(replacement.getBefore());
+				List<String> parameterNameList2 = signatureDiff.getAddedOperation().getParameterNameList();
+				int index2 = parameterNameList2.indexOf(replacement.getAfter());
+				if(index1 != -1 && index2 != -1 && index1 != index2 && parameterNameList1.size() == parameterNameList2.size()) {
+					return false;
+				}
+			}
+		}
 		return true;
 	}
 

src/test/java/org/refactoringminer/test/TestNewDatasetRefactorings.java

@@ -51,6 +51,6 @@ public void testAllRefactorings() throws Exception {
 				.or(Refactorings.MoveCode.getValue());
 		TestBuilder test = new TestBuilder(detector, REPOS, types);
 		RefactoringPopulator.feedTSERefactoringInstances(test);
-		test.assertExpectationsWithGitHubAPI(3427, 53, 114);
+		test.assertExpectationsWithGitHubAPI(3427, 50, 114);
 	}
 }

src/test/resources/oracle/tse-dataset/lucene-solr.json

@@ -275,6 +275,16 @@
           "type": "MOVE_OPERATION",
           "description": "Move Method\tpackage escapeDash(re String) : String from class org.apache.lucene.analysis.hunspell.Dictionary to private escapeDash(re String) : String from class org.apache.lucene.analysis.hunspell.AffixCondition",
           "validation": true
+        },
+        {
+          "type": "MOVE_CODE",
+          "description": "Move Code\tfrom private parseAffix(affixes TreeMap<String,List<Integer>>, secondStageFlags Set<Character>, header String, reader LineNumberReader, isSuffix boolean, seenPatterns Map<String,Integer>, seenStrips Map<String,Integer>, flags FlagEnumerator) : void in class org.apache.lucene.analysis.hunspell.Dictionary to public compile(kind AffixKind, strip String, condition String, line String) : AffixCondition in class org.apache.lucene.analysis.hunspell.AffixCondition",
+          "validation": true
+        },
+        {
+          "type": "MOVE_CODE",
+          "description": "Move Code\tfrom private parseAffix(affixes TreeMap<String,List<Integer>>, secondStageFlags Set<Character>, header String, reader LineNumberReader, isSuffix boolean, seenPatterns Map<String,Integer>, seenStrips Map<String,Integer>, flags FlagEnumerator) : void in class org.apache.lucene.analysis.hunspell.Dictionary to private skipCharPattern(condition String, pos int) : int in class org.apache.lucene.analysis.hunspell.AffixCondition",
+          "validation": true
         }
       ]
     },
@@ -501,12 +511,12 @@
         {
           "type": "RENAME_VARIABLE",
           "description": "Rename Variable\tkey : null to prefixLength : null in method private expandRoot(root Root<String>, misspelled String) : List<String> from class org.apache.lucene.analysis.hunspell.GeneratingSuggester",
-          "validation": true
+          "validation": false
         },
         {
           "type": "RENAME_VARIABLE",
           "description": "Rename Variable\tids : null to prefixId : null in method private expandRoot(root Root<String>, misspelled String) : List<String> from class org.apache.lucene.analysis.hunspell.GeneratingSuggester",
-          "validation": true
+          "validation": false
         }
       ]
     },