[fixes #3036] Keep builder default initializer position

2 files changed, 14 insertions, 7 deletions

diff --git a/src/core/lombok/javac/handlers/HandleBuilder.java b/src/core/lombok/javac/handlers/HandleBuilder.java
index d8fdfb1b..7f32001b 100644
--- a/src/core/lombok/javac/handlers/HandleBuilder.java
+++ b/src/core/lombok/javac/handlers/HandleBuilder.java
@@ -47,6 +47,7 @@ import com.sun.tools.javac.tree.JCTree.JCMethodInvocation;
 import com.sun.tools.javac.tree.JCTree.JCModifiers;
 import com.sun.tools.javac.tree.JCTree.JCNewClass;
 import com.sun.tools.javac.tree.JCTree.JCPrimitiveTypeTree;
+import com.sun.tools.javac.tree.JCTree.JCReturn;
 import com.sun.tools.javac.tree.JCTree.JCStatement;
 import com.sun.tools.javac.tree.JCTree.JCTypeApply;
 import com.sun.tools.javac.tree.JCTree.JCTypeParameter;
@@ -286,8 +287,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
 					bfd.nameOfDefaultProvider = parent.toName(DEFAULT_PREFIX + bfd.name);
 					bfd.nameOfSetFlag = parent.toName(bfd.name + SET_PREFIX);
 					bfd.builderFieldName = parent.toName(bfd.name + VALUE_PREFIX);
-					JCMethodDecl md = generateDefaultProvider(bfd.nameOfDefaultProvider, fieldNode, td.typarams);
-					recursiveSetGeneratedBy(md, annotationNode);
+					JCMethodDecl md = generateDefaultProvider(bfd.nameOfDefaultProvider, fieldNode, td.typarams, job);
 					if (md != null) injectMethod(parent, md);
 				}
 				addObtainVia(bfd, fieldNode);
@@ -804,16 +804,24 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
 		return methodDef;
 	}
 	
-	public static JCMethodDecl generateDefaultProvider(Name methodName, JavacNode fieldNode, List<JCTypeParameter> params) {
+	public static JCMethodDecl generateDefaultProvider(Name methodName, JavacNode fieldNode, List<JCTypeParameter> params, BuilderJob job) {
 		JavacTreeMaker maker = fieldNode.getTreeMaker();
 		JCVariableDecl field = (JCVariableDecl) fieldNode.get();
 		
-		JCStatement statement = maker.Return(field.init);
+		// Lombok tries to keep the position of the original initializer. First we save the expression ...
+		JCExpression init = field.init;
 		field.init = null;
 		
+		// ... then we generate an empty return statement ...
+		JCReturn statement = maker.Return(null);
 		JCBlock body = maker.Block(0, List.<JCStatement>of(statement));
 		int modifiers = Flags.PRIVATE | Flags.STATIC;
-		return maker.MethodDef(maker.Modifiers(modifiers), methodName, cloneType(maker, field.vartype, fieldNode), copyTypeParams(fieldNode, params), List.<JCVariableDecl>nil(), List.<JCExpression>nil(), body, null);
+		JCMethodDecl defaultProvider = maker.MethodDef(maker.Modifiers(modifiers), methodName, cloneType(maker, field.vartype, fieldNode), copyTypeParams(fieldNode, params), List.<JCVariableDecl>nil(), List.<JCExpression>nil(), body, null);
+		// ... then we set positions for everything else ...
+		recursiveSetGeneratedBy(defaultProvider, job.sourceNode);
+		// ... and finally add back the original expression
+		statement.expr = init;
+		return defaultProvider;
 	}
 	
 	public JCMethodDecl generateBuilderMethod(BuilderJob job) {
diff --git a/src/core/lombok/javac/handlers/HandleSuperBuilder.java b/src/core/lombok/javac/handlers/HandleSuperBuilder.java
index b5bc73fb..de8163dd 100644
--- a/src/core/lombok/javac/handlers/HandleSuperBuilder.java
+++ b/src/core/lombok/javac/handlers/HandleSuperBuilder.java
@@ -208,8 +208,7 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
 				bfd.nameOfDefaultProvider = parent.toName(DEFAULT_PREFIX + bfd.name);
 				bfd.nameOfSetFlag = parent.toName(bfd.name + SET_PREFIX);
 				bfd.builderFieldName = parent.toName(bfd.name + VALUE_PREFIX);
-				JCMethodDecl md = HandleBuilder.generateDefaultProvider(bfd.nameOfDefaultProvider, fieldNode, td.typarams);
-				recursiveSetGeneratedBy(md, annotationNode);
+				JCMethodDecl md = HandleBuilder.generateDefaultProvider(bfd.nameOfDefaultProvider, fieldNode, td.typarams, job);
 				if (md != null) injectMethod(parent, md);
 			}
 			addObtainVia(bfd, fieldNode);