Replace invoc towith invoc target.

+ Deal with empty source anchors. Not sure the default 0 value is correct.

src/Carrefour-FastAndBindingGenerator/CRFBinderVisitor.class.st

@@ -279,17 +279,24 @@ CRFBinderVisitor >> visitFASTJavaMethodEntity: aFASTJavaMethodEntity [
 
 { #category : 'visitor' }
 CRFBinderVisitor >> visitFASTJavaMethodInvocation: aFASTJavaMethodInvocation [
-	(self sourceFamixEntity queryAllOutgoingInvocations
-		select: [ :invoc | 
-			(invoc hasSourceAnchor
-				ifTrue: [ | sourceStartPos |
-					sourceStartPos := self sourceFamixEntityStartPo.
-					invoc sourceAnchor startPos - sourceStartPos >= (aFASTJavaMethodInvocation startPos - 1)
-						and: [ invoc sourceAnchor endPos - sourceStartPos <= (aFASTJavaMethodInvocation endPos + 1) ] ]
-				ifFalse: [ invoc to first name beginsWith: aFASTJavaMethodInvocation name ]) ])
-		ifNotEmpty: [ :collectionOfPotentialInvoc | 
-					(collectionOfPotentialInvoc sorted: [ :invoc1 :invoc2 | invoc1 sourceAnchor intervalAsCharPos size > invoc2 sourceAnchor intervalAsCharPos size ]) first
-				fast: aFASTJavaMethodInvocation ].
+
+	(self sourceFamixEntity queryAllOutgoingInvocations select: [ :invoc |
+		 invoc hasSourceAnchor
+			 ifTrue: [
+				 | sourceStartPos |
+				 sourceStartPos := self sourceFamixEntityStartPo.
+				 invoc sourceAnchor startPos - sourceStartPos
+				 >= (aFASTJavaMethodInvocation startPos - 1) and: [
+					 invoc sourceAnchor endPos - sourceStartPos
+					 <= (aFASTJavaMethodInvocation endPos + 1) ] ]
+			 ifFalse: [
+			 invoc target first name beginsWith: aFASTJavaMethodInvocation name ] ])
+		ifNotEmpty: [ :collectionOfPotentialInvoc |
+			(collectionOfPotentialInvoc sorted: [ :invoc |
+				 invoc sourceAnchor
+					 ifNil: [ 0 ]
+					 ifNotNil: [ :sourceAnchor | sourceAnchor intervalAsCharPos size ] ]
+					 descending) first fast: aFASTJavaMethodInvocation ].
 	super visitFASTJavaMethodInvocation: aFASTJavaMethodInvocation
 ]