From f51bbce3e396a0151bc0242d00e250f2bc720316 Mon Sep 17 00:00:00 2001
From: Jan Rieke <rieke@subshell.com>
Date: Mon, 13 Mar 2017 15:59:46 +0100
Subject: do not assign values in build() method for extendable builders (WIP)

---
 .../lombok/eclipse/handlers/HandleBuilder.java     | 43 ++++++++++++----------
 src/core/lombok/javac/handlers/HandleBuilder.java  | 41 +++++++++++----------
 2 files changed, 45 insertions(+), 39 deletions(-)

(limited to 'src/core')

diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java
index 4bfc89f4..74ef57a7 100644
--- a/src/core/lombok/eclipse/handlers/HandleBuilder.java
+++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java
@@ -556,31 +556,34 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
 		MethodDeclaration out = new MethodDeclaration(((CompilationUnitDeclaration) type.top().get()).compilationResult);
 		out.bits |= ECLIPSE_DO_NOT_TOUCH_FLAG;
 		List<Statement> statements = new ArrayList<Statement>();
+		List<Expression> args = new ArrayList<Expression>();
 		
-		if (addCleaning) {
-			FieldReference thisUnclean = new FieldReference(CLEAN_FIELD_NAME, 0);
-			thisUnclean.receiver = new ThisReference(0, 0);
-			Expression notClean = new UnaryExpression(thisUnclean, OperatorIds.NOT);
-			MessageSend invokeClean = new MessageSend();
-			invokeClean.selector = CLEAN_METHOD_NAME;
-			statements.add(new IfStatement(notClean, invokeClean, 0, 0));
-		}
+		// Extendable builders assign their values in the constructor, not in this build() method.
+		if (!useBuilderBasedConstructor) {
+			if (addCleaning) {
+				FieldReference thisUnclean = new FieldReference(CLEAN_FIELD_NAME, 0);
+				thisUnclean.receiver = new ThisReference(0, 0);
+				Expression notClean = new UnaryExpression(thisUnclean, OperatorIds.NOT);
+				MessageSend invokeClean = new MessageSend();
+				invokeClean.selector = CLEAN_METHOD_NAME;
+				statements.add(new IfStatement(notClean, invokeClean, 0, 0));
+			}
 		
-		for (BuilderFieldData bfd : builderFields) {
-			if (bfd.singularData != null && bfd.singularData.getSingularizer() != null) {
-				bfd.singularData.getSingularizer().appendBuildCode(bfd.singularData, type, statements, bfd.name);
+			for (BuilderFieldData bfd : builderFields) {
+				if (bfd.singularData != null && bfd.singularData.getSingularizer() != null) {
+					bfd.singularData.getSingularizer().appendBuildCode(bfd.singularData, type, statements, bfd.name);
+				}
 			}
-		}
 		
-		List<Expression> args = new ArrayList<Expression>();
-		for (BuilderFieldData bfd : builderFields) {
-			args.add(new SingleNameReference(bfd.name, 0L));
-		}
+			for (BuilderFieldData bfd : builderFields) {
+				args.add(new SingleNameReference(bfd.name, 0L));
+			}
 		
-		if (addCleaning) {
-			FieldReference thisUnclean = new FieldReference(CLEAN_FIELD_NAME, 0);
-			thisUnclean.receiver = new ThisReference(0, 0);
-			statements.add(new Assignment(thisUnclean, new TrueLiteral(0, 0), 0));
+			if (addCleaning) {
+				FieldReference thisUnclean = new FieldReference(CLEAN_FIELD_NAME, 0);
+				thisUnclean.receiver = new ThisReference(0, 0);
+				statements.add(new Assignment(thisUnclean, new TrueLiteral(0, 0), 0));
+			}
 		}
 		
 		out.modifiers = ClassFileConstants.AccPublic;
diff --git a/src/core/lombok/javac/handlers/HandleBuilder.java b/src/core/lombok/javac/handlers/HandleBuilder.java
index 7701d85c..41ff64e0 100644
--- a/src/core/lombok/javac/handlers/HandleBuilder.java
+++ b/src/core/lombok/javac/handlers/HandleBuilder.java
@@ -546,27 +546,30 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
 		
 		JCExpression call;
 		ListBuffer<JCStatement> statements = new ListBuffer<JCStatement>();
-		
-		if (addCleaning) {
-			JCExpression notClean = maker.Unary(CTC_NOT, maker.Select(maker.Ident(type.toName("this")), type.toName("$lombokUnclean")));
-			JCStatement invokeClean = maker.Exec(maker.Apply(List.<JCExpression>nil(), maker.Ident(type.toName("$lombokClean")), List.<JCExpression>nil()));
-			JCIf ifUnclean = maker.If(notClean, invokeClean, null);
-			statements.append(ifUnclean);
-		}
-		
-		for (BuilderFieldData bfd : builderFields) {
-			if (bfd.singularData != null && bfd.singularData.getSingularizer() != null) {
-				bfd.singularData.getSingularizer().appendBuildCode(bfd.singularData, type, source, statements, bfd.name);
-			}
-		}
-		
 		ListBuffer<JCExpression> args = new ListBuffer<JCExpression>();
-		for (BuilderFieldData bfd : builderFields) {
-			args.append(maker.Ident(bfd.name));
-		}
+
+		// Extendable builders assign their values in the constructor, not in this build() method.
+		if (!useBuilderBasedConstructor) {
+			if (addCleaning) {
+				JCExpression notClean = maker.Unary(CTC_NOT, maker.Select(maker.Ident(type.toName("this")), type.toName("$lombokUnclean")));
+				JCStatement invokeClean = maker.Exec(maker.Apply(List.<JCExpression>nil(), maker.Ident(type.toName("$lombokClean")), List.<JCExpression>nil()));
+				JCIf ifUnclean = maker.If(notClean, invokeClean, null);
+				statements.append(ifUnclean);
+			}
+			
+			for (BuilderFieldData bfd : builderFields) {
+				if (bfd.singularData != null && bfd.singularData.getSingularizer() != null) {
+					bfd.singularData.getSingularizer().appendBuildCode(bfd.singularData, type, source, statements, bfd.name);
+				}
+			}
 		
-		if (addCleaning) {
-			statements.append(maker.Exec(maker.Assign(maker.Select(maker.Ident(type.toName("this")), type.toName("$lombokUnclean")), maker.Literal(CTC_BOOLEAN, true))));
+			for (BuilderFieldData bfd : builderFields) {
+				args.append(maker.Ident(bfd.name));
+			}
+			
+			if (addCleaning) {
+				statements.append(maker.Exec(maker.Assign(maker.Select(maker.Ident(type.toName("this")), type.toName("$lombokUnclean")), maker.Literal(CTC_BOOLEAN, true))));
+			}
 		}
 		
 		if (builderName == null) {
-- 
cgit