From 65302bc13a1ab670dac552e2214989c7381f71a8 Mon Sep 17 00:00:00 2001
From: Caleb Brinkman <cbrinkman@sonatype.com>
Date: Mon, 28 Oct 2019 12:09:15 -0500
Subject: More test fixes

---
 src/core/lombok/eclipse/handlers/HandleBuilder.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/core')

diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java
index 017cde17..70b07fb8 100755
--- a/src/core/lombok/eclipse/handlers/HandleBuilder.java
+++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java
@@ -931,12 +931,6 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
 		FieldDeclaration fd = (FieldDeclaration) fieldNode.get();
 		char[] name = fd.name;
 
-		for (int i = 0; i < len; i++) {
-			if (!(existing[i] instanceof MethodDeclaration)) continue;
-			char[] existingName = existing[i].selector;
-			if (Arrays.equals(name, existingName) && !isTolerate(fieldNode, existing[i])) return;
-		}
-
 		String setterPrefix = prefix.isEmpty() ? "set" : prefix;
 		String setterName;
 		if(fluent) {
@@ -945,6 +939,12 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
 			setterName = HandlerUtil.buildAccessorName(setterPrefix, new String(paramName));
 		}
 
+		for (int i = 0; i < len; i++) {
+			if (!(existing[i] instanceof MethodDeclaration)) continue;
+			char[] existingName = existing[i].selector;
+			if (Arrays.equals(setterName.toCharArray(), existingName) && !isTolerate(fieldNode, existing[i])) return;
+		}
+
 		List<Annotation> methodAnnsList = Collections.<Annotation>emptyList();
 		Annotation[] methodAnns = EclipseHandlerUtil.findCopyableToSetterAnnotations(originalFieldNode);
 		if (methodAnns != null && methodAnns.length > 0) methodAnnsList = Arrays.asList(methodAnns);
-- 
cgit