From f6ad0ecde954a1ad6cd347b30dbec2c56e3fe3d3 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <r.zwitserloot@projectlombok.org>
Date: Tue, 26 Mar 2019 01:36:40 +0100
Subject: [fixes #2050] [fixes #2061] javac would fail to skip generating
build() method if it is already there
---
src/core/lombok/eclipse/handlers/HandleBuilder.java | 2 +-
src/core/lombok/javac/handlers/HandleBuilder.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java
index 3adbc27c..7a831f3d 100755
--- a/src/core/lombok/eclipse/handlers/HandleBuilder.java
+++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java
@@ -170,7 +170,7 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
List<char[]> typeArgsForToBuilder = null;
if (builderMethodName == null) builderMethodName = "builder";
- if (buildMethodName == null) builderMethodName = "build";
+ if (buildMethodName == null) buildMethodName = "build";
if (builderClassName == null) builderClassName = "";
boolean generateBuilderMethod;
diff --git a/src/core/lombok/javac/handlers/HandleBuilder.java b/src/core/lombok/javac/handlers/HandleBuilder.java
index 2ef2fac2..d6fb9728 100644
--- a/src/core/lombok/javac/handlers/HandleBuilder.java
+++ b/src/core/lombok/javac/handlers/HandleBuilder.java
@@ -417,7 +417,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
}
{
- MemberExistsResult methodExists = methodExists(builderMethodName, builderType, -1);
+ MemberExistsResult methodExists = methodExists(buildMethodName, builderType, -1);
if (methodExists == MemberExistsResult.EXISTS_BY_LOMBOK) methodExists = methodExists(buildMethodName, builderType, 0);
if (methodExists == MemberExistsResult.NOT_EXISTS) {
JCMethodDecl md = generateBuildMethod(tdParent, isStatic, buildMethodName, nameOfBuilderMethod, returnType, builderFields, builderType, thrownExceptions, ast, addCleaning);
--
cgit