Fix last test

This commit is contained in:
Caleb Brinkman committed 2019-10-28 13:48:59 -05:00
1 parent 1b0c2f34a5
commit b7e42d13ea
1 file changed
+7 -7
@@ -826,13 +826,6 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
private void makePrefixedSetterMethodForBuilder(CheckerFrameworkVersion cfv, JavacNode builderType, boolean deprecate, JavacNode fieldNode, Name paramName, Name nameOfSetFlag, JavacNode source, boolean fluent, boolean chain, List<JCAnnotation> annosOnParam, JavacNode originalFieldNode, AccessLevel access, String prefix) {
Name fieldName = ((JCVariableDecl) fieldNode.get()).name;
for (JavacNode child : builderType.down()) {
if (child.getKind() != Kind.METHOD) continue;
JCMethodDecl methodDecl = (JCMethodDecl) child.get();
Name existingName = methodDecl.name;
if (existingName.equals(fieldName) && !isTolerate(fieldNode, methodDecl)) return;
}
String setterPrefix = prefix.isEmpty() ? "set" : prefix;
String setterName;
if(fluent) {
@@ -841,6 +834,13 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
setterName = HandlerUtil.buildAccessorName(setterPrefix, paramName.toString());
}
for (JavacNode child : builderType.down()) {
if (child.getKind() != Kind.METHOD) continue;
JCMethodDecl methodDecl = (JCMethodDecl) child.get();
Name existingName = methodDecl.name;
if (existingName.equals(builderType.toName(setterName)) && !isTolerate(fieldNode, methodDecl)) return;
}
JavacTreeMaker maker = fieldNode.getTreeMaker();
List<JCAnnotation> methodAnns = JavacHandlerUtil.findCopyableToSetterAnnotations(originalFieldNode);