[fixes #2327] mostly trivial: Added this. for field access and unified code gen of build() methods for @Builder.

doc/changelog.markdown

@@ -5,6 +5,7 @@ Lombok Changelog
 * PLATFORM: Support for JDK13 (including `yield` in switch expressions, as well as delombok having a nicer style for arrow-style switch blocks, and text blocks).
 * FEATURE: You can now configure a builder's 'setter' prefixes via `@Builder(setterPrefix = "set")` for example. We discourage doing this, but if some library you use requires them, have at it. [Pull Request #2174](https://github.com/rzwitserloot/lombok/pull/2174], [Issue #1805](https://github.com/rzwitserloot/lombok/issues/1805).
 * BUGFIX: Referring to an inner class inside the generics on a class marked with `@SuperBuilder` would cause the error `wrong number of type arguments; required 3` [Issue #2262](https://github.com/rzwitserloot/lombok/issues/2262); fixed by github user [`@Lekanich`](https://github.com/rzwitserloot/lombok/issues/2262) - thank you!
+* BUGFIX: Some of the code generated by `@Builder` did not include `this.` prefixes when accessing fields. While semantically it didn't matter, if you use the 'add this prefix for field accesses' save action in eclipse, the save action would break. [Issue #2327](https://github.com/rzwitserloot/lombok/issues/2327)
 * IMPROBABLE BREAKING CHANGE: Lombok now generates qualified types (so, `Outer.Inner` instead of just `Inner`) in most type signatures that it generates; this should avoid exotic scenarios where the types lombok puts in signatures end up referring to unintended other types, which can occur if your class implements an interface that itself defines a type with the same name as one defined in your source file. I told you it was exotic. Thanks to Hunter Anderson for doing some preliminary work on this change. [Issue #2268](https://github.com/rzwitserloot/lombok/issues/2268)
 
 

src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2019 The Project Lombok Authors.
+ * Copyright (C) 2009-2020 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/core/lombok/eclipse/handlers/EclipseSingularsRecipes.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2019 The Project Lombok Authors.
+ * Copyright (C) 2015-2020 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -273,6 +273,10 @@ public class EclipseSingularsRecipes {
 		
 		public abstract void appendBuildCode(SingularData data, EclipseNode builderType, List<Statement> statements, char[] targetVariableName, String builderVariable);
 		
+		public boolean shadowedDuringBuild() {
+			return true;
+		}
+		
 		public boolean requiresCleaning() {
 			try {
 				return !getClass().getMethod("appendCleaningCode", SingularData.class, EclipseNode.class, List.class).getDeclaringClass().equals(EclipseSingularizer.class);

src/core/lombok/eclipse/handlers/HandleBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2019 The Project Lombok Authors.
+ * Copyright (C) 2013-2020 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,6 @@ import org.eclipse.jdt.internal.compiler.ast.Argument;
 import org.eclipse.jdt.internal.compiler.ast.ArrayInitializer;
 import org.eclipse.jdt.internal.compiler.ast.Assignment;
 import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;
-import org.eclipse.jdt.internal.compiler.ast.ConditionalExpression;
 import org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;
 import org.eclipse.jdt.internal.compiler.ast.EqualExpression;
 import org.eclipse.jdt.internal.compiler.ast.Expression;
@@ -713,6 +712,13 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
 		List<Expression> args = new ArrayList<Expression>();
 		for (BuilderFieldData bfd : builderFields) {
 			if (bfd.nameOfSetFlag != null) {
+				LocalDeclaration ld = new LocalDeclaration(bfd.builderFieldName, 0, 0);
+				ld.type = copyType(bfd.type);
+				FieldReference builderAssign = new FieldReference(bfd.builderFieldName, 0);
+				builderAssign.receiver = new ThisReference(0, 0);
+				ld.initialization = builderAssign;
+				statements.add(ld);
+				
 				MessageSend inv = new MessageSend();
 				inv.sourceStart = source.sourceStart;
 				inv.sourceEnd = source.sourceEnd;
@@ -720,12 +726,19 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
 				inv.selector = bfd.nameOfDefaultProvider;
 				inv.typeArguments = typeParameterNames(((TypeDeclaration) type.get()).typeParameters);
 				
-				args.add(new ConditionalExpression(
-					new SingleNameReference(bfd.nameOfSetFlag, 0L),
-					new SingleNameReference(bfd.builderFieldName, 0L),
-					inv));
-			} else {
+				Assignment defaultAssign = new Assignment(new SingleNameReference(bfd.builderFieldName, 0L), inv, 0);
+				FieldReference thisSet = new FieldReference(bfd.nameOfSetFlag, 0L);
+				thisSet.receiver = new ThisReference(0, 0);
+				Expression thisNotSet = new UnaryExpression(thisSet, OperatorIds.NOT);
+				statements.add(new IfStatement(thisNotSet, defaultAssign, 0, 0));
+			}
+			
+			if (bfd.nameOfSetFlag != null || (bfd.singularData != null && bfd.singularData.getSingularizer().shadowedDuringBuild())) {
 				args.add(new SingleNameReference(bfd.builderFieldName, 0L));
+			} else {
+				FieldReference fr = new FieldReference(bfd.builderFieldName, 0L);
+				fr.receiver = new ThisReference(0, 0);
+				args.add(fr);
 			}
 		}
 		

src/core/lombok/eclipse/handlers/HandleConstructor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2019 The Project Lombok Authors.
+ * Copyright (C) 2010-2020 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/core/lombok/eclipse/handlers/HandleSuperBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2019 The Project Lombok Authors.
+ * Copyright (C) 2013-2020 The Project Lombok Authors.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/core/lombok/javac/handlers/HandleBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2019 The Project Lombok Authors.
+ * Copyright (C) 2013-2020 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -661,12 +661,17 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
 		}
 		
 		ListBuffer<JCExpression> args = new ListBuffer<JCExpression>();
+		Name thisName = type.toName("this");
 		for (BuilderFieldData bfd : builderFields) {
 			if (bfd.nameOfSetFlag != null) {
-				statements.append(maker.VarDef(maker.Modifiers(0L), bfd.builderFieldName, cloneType(maker, bfd.type, source, tdParent.getContext()), maker.Select(maker.Ident(type.toName("this")), bfd.builderFieldName)));
-				statements.append(maker.If(maker.Unary(CTC_NOT, maker.Ident(bfd.nameOfSetFlag)), maker.Exec(maker.Assign(maker.Ident(bfd.builderFieldName), maker.Apply(typeParameterNames(maker, ((JCClassDecl) tdParent.get()).typarams), maker.Select(maker.Ident(((JCClassDecl) tdParent.get()).name), bfd.nameOfDefaultProvider), List.<JCExpression>nil()))), null));
+				statements.append(maker.VarDef(maker.Modifiers(0L), bfd.builderFieldName, cloneType(maker, bfd.type, source, tdParent.getContext()), maker.Select(maker.Ident(thisName), bfd.builderFieldName)));
+				statements.append(maker.If(maker.Unary(CTC_NOT, maker.Select(maker.Ident(thisName), bfd.nameOfSetFlag)), maker.Exec(maker.Assign(maker.Ident(bfd.builderFieldName), maker.Apply(typeParameterNames(maker, ((JCClassDecl) tdParent.get()).typarams), maker.Select(maker.Ident(((JCClassDecl) tdParent.get()).name), bfd.nameOfDefaultProvider), List.<JCExpression>nil()))), null));
+			}
+			if (bfd.nameOfSetFlag != null || (bfd.singularData != null && bfd.singularData.getSingularizer().shadowedDuringBuild())) {
+				args.append(maker.Ident(bfd.builderFieldName));
+			} else {
+				args.append(maker.Select(maker.Ident(thisName), bfd.builderFieldName));
 			}
-			args.append(maker.Ident(bfd.builderFieldName));
 		}
 		
 		if (addCleaning) {

src/core/lombok/javac/handlers/HandleSuperBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2019 The Project Lombok Authors.
+ * Copyright (C) 2013-2020 The Project Lombok Authors.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/core/lombok/javac/handlers/JavacHandlerUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2019 The Project Lombok Authors.
+ * Copyright (C) 2009-2020 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/core/lombok/javac/handlers/JavacSingularsRecipes.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2019 The Project Lombok Authors.
+ * Copyright (C) 2015-2020 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -344,6 +344,10 @@ public class JavacSingularsRecipes {
 		
 		public abstract void appendBuildCode(SingularData data, JavacNode builderType, JCTree source, ListBuffer<JCStatement> statements, Name targetVariableName, String builderVariable);
 		
+		public boolean shadowedDuringBuild() {
+			return true;
+		}
+		
 		public boolean requiresCleaning() {
 			try {
 				return !getClass().getMethod("appendCleaningCode", SingularData.class, JavacNode.class, JCTree.class, ListBuffer.class).getDeclaringClass().equals(JavacSingularizer.class);

test/core/src/lombok/DirectoryRunner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2019 The Project Lombok Authors.
+ * Copyright (C) 2009-2020 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,20 +24,23 @@ package lombok;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import lombok.eclipse.Eclipse;
-import lombok.javac.Javac;
-
 import org.junit.runner.Description;
 import org.junit.runner.Runner;
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunNotifier;
 
+import lombok.eclipse.Eclipse;
+import lombok.javac.Javac;
+
 public class DirectoryRunner extends Runner {
-	/** Fill in a file name (or multiple, space separated) to reduce the testset to just the named file(s). */
-	private static final String DEBUG_FOCUS_ON_FILE = "";
+	/** Add 1 or more file names to reduce the testset to just the named file(s). No files = test it all. */
+	private static final List<String> DEBUG_FOCUS_ON_FILE = Arrays.asList(
+		);
 	
 	public enum Compiler {
 		DELOMBOK {
@@ -80,7 +83,7 @@ public class DirectoryRunner extends Runner {
 	private static final FileFilter JAVA_FILE_FILTER = new FileFilter() {
 		@Override public boolean accept(File file) {
 			return file.isFile() && file.getName().endsWith(".java") &&
-				(DEBUG_FOCUS_ON_FILE.isEmpty() || (" " + DEBUG_FOCUS_ON_FILE + " ").contains(" " + file.getName() + " "));
+				(DEBUG_FOCUS_ON_FILE.isEmpty() || DEBUG_FOCUS_ON_FILE.contains(file.getName()));
 		}
 	};
 	

test/transform/resource/after-delombok/BuilderComplex.java

@@ -37,7 +37,7 @@ class BuilderComplex {
 		}
 		@java.lang.SuppressWarnings("all")
 		public void execute() {
-			BuilderComplex.<T>testVoidWithGenerics(number, arg2, arg3, selfRef);
+			BuilderComplex.<T>testVoidWithGenerics(this.number, this.arg2, this.arg3, this.selfRef);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderDefaults.java

@@ -51,10 +51,10 @@ public final class BuilderDefaults {
 		@java.lang.SuppressWarnings("all")
 		public BuilderDefaults build() {
 			int x$value = this.x$value;
-			if (!x$set) x$value = BuilderDefaults.$default$x();
+			if (!this.x$set) x$value = BuilderDefaults.$default$x();
 			long z$value = this.z$value;
-			if (!z$set) z$value = BuilderDefaults.$default$z();
-			return new BuilderDefaults(x$value, name, z$value);
+			if (!this.z$set) z$value = BuilderDefaults.$default$z();
+			return new BuilderDefaults(x$value, this.name, z$value);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderDefaultsGenerics.java

@@ -59,11 +59,11 @@ public class BuilderDefaultsGenerics<N extends Number, T, R extends List<T>> {
 		@java.lang.SuppressWarnings("all")
 		public BuilderDefaultsGenerics<N, T, R> build() {
 			java.util.concurrent.Callable<N> callable$value = this.callable$value;
-			if (!callable$set) callable$value = BuilderDefaultsGenerics.<N, T, R>$default$callable();
+			if (!this.callable$set) callable$value = BuilderDefaultsGenerics.<N, T, R>$default$callable();
 			T tee$value = this.tee$value;
-			if (!tee$set) tee$value = BuilderDefaultsGenerics.<N, T, R>$default$tee();
+			if (!this.tee$set) tee$value = BuilderDefaultsGenerics.<N, T, R>$default$tee();
 			R arrr$value = this.arrr$value;
-			if (!arrr$set) arrr$value = BuilderDefaultsGenerics.<N, T, R>$default$arrr();
+			if (!this.arrr$set) arrr$value = BuilderDefaultsGenerics.<N, T, R>$default$arrr();
 			return new BuilderDefaultsGenerics<N, T, R>(callable$value, tee$value, arrr$value);
 		}
 		@java.lang.Override

test/transform/resource/after-delombok/BuilderDefaultsWarnings.java

@@ -60,7 +60,7 @@ public class BuilderDefaultsWarnings {
 			default: 
 				items = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.items));
 			}
-			return new BuilderDefaultsWarnings(x, z, items);
+			return new BuilderDefaultsWarnings(this.x, this.z, items);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderGenericMethod.java

@@ -25,7 +25,7 @@ class BuilderGenericMethod<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public Map<N, T> build() {
-			return BuilderGenericMethod.this.<N>foo(a, b);
+			return BuilderGenericMethod.this.<N>foo(this.a, this.b);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderInstanceMethod.java

@@ -38,7 +38,7 @@ class BuilderInstanceMethod<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public String build() {
-			return BuilderInstanceMethod.this.create(show, yes, also, $andMe);
+			return BuilderInstanceMethod.this.create(this.show, this.yes, this.also, this.$andMe);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderJavadoc.java

@@ -69,7 +69,7 @@ class BuilderJavadoc<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderJavadoc<T> build() {
-			return new BuilderJavadoc<T>(basic, getsetwith, predef, predefWithJavadoc);
+			return new BuilderJavadoc<T>(this.basic, this.getsetwith, this.predef, this.predefWithJavadoc);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderSimple.java

@@ -30,7 +30,7 @@ class BuilderSimple<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSimple<T> build() {
-			return new BuilderSimple<T>(yes, also);
+			return new BuilderSimple<T>(this.yes, this.also);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java

@@ -19,7 +19,7 @@ class BuilderSimpleWithSetterPrefix<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSimpleWithSetterPrefix<T> build() {
-			return new BuilderSimpleWithSetterPrefix<T>(unprefixed);
+			return new BuilderSimpleWithSetterPrefix<T>(this.unprefixed);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderTypeAnnos.java

@@ -29,7 +29,7 @@ class BuilderTypeAnnos {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderTypeAnnos build() {
-			return new BuilderTypeAnnos(foo);
+			return new BuilderTypeAnnos(this.foo);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java

@@ -29,7 +29,7 @@ class BuilderTypeAnnosWithSetterPrefix {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderTypeAnnosWithSetterPrefix build() {
-			return new BuilderTypeAnnosWithSetterPrefix(foo);
+			return new BuilderTypeAnnosWithSetterPrefix(this.foo);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderWithAccessors.java

@@ -45,7 +45,7 @@ class BuilderWithAccessors {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithAccessors build() {
-			return new BuilderWithAccessors(plower, upper, foo, _bar);
+			return new BuilderWithAccessors(this.plower, this.upper, this.foo, this._bar);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderWithBadNames.java

@@ -27,7 +27,7 @@ public class BuilderWithBadNames {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithBadNames build() {
-			return new BuilderWithBadNames(build, toString);
+			return new BuilderWithBadNames(this.build, this.toString);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderWithDeprecated.java

@@ -99,7 +99,7 @@ public class BuilderWithDeprecated {
 				strings = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.strings));
 			}
 			com.google.common.collect.ImmutableList<Integer> numbers = this.numbers == null ? com.google.common.collect.ImmutableList.<Integer>of() : this.numbers.build();
-			return new BuilderWithDeprecated(dep1, dep2, strings, numbers);
+			return new BuilderWithDeprecated(this.dep1, this.dep2, strings, numbers);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java

@@ -25,7 +25,7 @@ class BuilderWithExistingBuilderClass<T, K extends Number> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithExistingBuilderClass<String, Z> build() {
-			return BuilderWithExistingBuilderClass.<Z>staticMethod(arg1, arg2, arg3);
+			return BuilderWithExistingBuilderClass.<Z>staticMethod(this.arg1, this.arg2, this.arg3);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java

@@ -25,7 +25,7 @@ class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithExistingBuilderClassWithSetterPrefix<String, Z> build() {
-			return BuilderWithExistingBuilderClassWithSetterPrefix.<Z>staticMethod(arg1, arg2, arg3);
+			return BuilderWithExistingBuilderClassWithSetterPrefix.<Z>staticMethod(this.arg1, this.arg2, this.arg3);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java

@@ -18,7 +18,7 @@ class BuilderWithNoBuilderMethod {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithNoBuilderMethod build() {
-			return new BuilderWithNoBuilderMethod(a);
+			return new BuilderWithNoBuilderMethod(this.a);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderWithNonNull.java

@@ -25,7 +25,7 @@ class BuilderWithNonNull {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithNonNull build() {
-			return new BuilderWithNonNull(id);
+			return new BuilderWithNonNull(this.id);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java

@@ -25,7 +25,7 @@ class BuilderWithNonNullWithSetterPrefix {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithNonNullWithSetterPrefix build() {
-			return new BuilderWithNonNullWithSetterPrefix(id);
+			return new BuilderWithNonNullWithSetterPrefix(this.id);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java

@@ -31,7 +31,7 @@ public class BuilderWithRecursiveGenerics {
 			}
 			@java.lang.SuppressWarnings("all")
 			public BuilderWithRecursiveGenerics.Test<Foo, Bar, Quz> build() {
-				return new BuilderWithRecursiveGenerics.Test<Foo, Bar, Quz>(foo, bar);
+				return new BuilderWithRecursiveGenerics.Test<Foo, Bar, Quz>(this.foo, this.bar);
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderWithToBuilder.java

@@ -72,7 +72,7 @@ class BuilderWithToBuilder<T> {
 			default: 
 				bars = java.util.Collections.unmodifiableList(new java.util.ArrayList<T>(this.bars));
 			}
-			return new BuilderWithToBuilder<T>(one, two, foo, bars);
+			return new BuilderWithToBuilder<T>(this.one, this.two, this.foo, bars);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
@@ -127,7 +127,7 @@ class ConstructorWithToBuilder<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public ConstructorWithToBuilder<T> build() {
-			return new ConstructorWithToBuilder<T>(mOne, baz, bars);
+			return new ConstructorWithToBuilder<T>(this.mOne, this.baz, this.bars);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/BuilderWithTolerate.java

@@ -21,7 +21,7 @@ public class BuilderWithTolerate {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithTolerate build() {
-			return new BuilderWithTolerate(value);
+			return new BuilderWithTolerate(this.value);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/CheckerFrameworkBuilder.java

@@ -87,8 +87,8 @@ class CheckerFrameworkBuilder {
 				names = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.names));
 			}
 			int x$value = this.x$value;
-			if (!x$set) x$value = CheckerFrameworkBuilder.$default$x();
-			return new CheckerFrameworkBuilder(x$value, y, z, names);
+			if (!this.x$set) x$value = CheckerFrameworkBuilder.$default$x();
+			return new CheckerFrameworkBuilder(x$value, this.y, this.z, names);
 		}
 		@org.checkerframework.dataflow.qual.SideEffectFree
 		@java.lang.Override

test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java

@@ -30,8 +30,8 @@ final class ConstructorsWithBuilderDefaults {
 		@java.lang.SuppressWarnings("all")
 		public ConstructorsWithBuilderDefaults build() {
 			int x$value = this.x$value;
-			if (!x$set) x$value = ConstructorsWithBuilderDefaults.$default$x();
-			return new ConstructorsWithBuilderDefaults(x$value, y);
+			if (!this.x$set) x$value = ConstructorsWithBuilderDefaults.$default$x();
+			return new ConstructorsWithBuilderDefaults(x$value, this.y);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java

@@ -54,10 +54,10 @@ final class ConstructorsWithBuilderDefaults<T> {
 		@java.lang.SuppressWarnings("all")
 		public ConstructorsWithBuilderDefaults<T> build() {
 			java.util.List<T> z$value = this.z$value;
-			if (!z$set) z$value = ConstructorsWithBuilderDefaults.<T>$default$z();
+			if (!this.z$set) z$value = ConstructorsWithBuilderDefaults.<T>$default$z();
 			T x$value = this.x$value;
-			if (!x$set) x$value = ConstructorsWithBuilderDefaults.<T>$default$x();
-			return new ConstructorsWithBuilderDefaults<T>(z$value, x$value, q);
+			if (!this.x$set) x$value = ConstructorsWithBuilderDefaults.<T>$default$x();
+			return new ConstructorsWithBuilderDefaults<T>(z$value, x$value, this.q);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-delombok/JacksonJsonProperty.java

@@ -25,7 +25,7 @@ public class JacksonJsonProperty {
 		}
 		@java.lang.SuppressWarnings("all")
 		public JacksonJsonProperty build() {
-			return new JacksonJsonProperty(kebabCaseProp);
+			return new JacksonJsonProperty(this.kebabCaseProp);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")

test/transform/resource/after-ecj/BuilderComplex.java

@@ -26,7 +26,7 @@ class BuilderComplex {
       return this;
     }
     public @java.lang.SuppressWarnings("all") void execute() {
-      BuilderComplex.<T>testVoidWithGenerics(number, arg2, arg3, selfRef);
+      BuilderComplex.<T>testVoidWithGenerics(this.number, this.arg2, this.arg3, this.selfRef);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((((("BuilderComplex.TestVoidName(number=" + this.number) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ", selfRef=") + this.selfRef) + ")");

test/transform/resource/after-ecj/BuilderDefaults.java

@@ -25,7 +25,13 @@ public final @Value @Builder class BuilderDefaults {
       return this;
     }
     public @java.lang.SuppressWarnings("all") BuilderDefaults build() {
-      return new BuilderDefaults((x$set ? x$value : BuilderDefaults.$default$x()), name, (z$set ? z$value : BuilderDefaults.$default$z()));
+      int x$value = this.x$value;
+      if ((! this.x$set))
+          x$value = BuilderDefaults.$default$x();
+      long z$value = this.z$value;
+      if ((! this.z$set))
+          z$value = BuilderDefaults.$default$z();
+      return new BuilderDefaults(x$value, this.name, z$value);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((("BuilderDefaults.BuilderDefaultsBuilder(x$value=" + this.x$value) + ", name=") + this.name) + ", z$value=") + this.z$value) + ")");

test/transform/resource/after-ecj/BuilderDefaultsGenerics.java

@@ -27,7 +27,16 @@ public @Builder class BuilderDefaultsGenerics<N extends Number, T, R extends Lis
       return this;
     }
     public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics<N, T, R> build() {
-      return new BuilderDefaultsGenerics<N, T, R>((callable$set ? callable$value : BuilderDefaultsGenerics.<N, T, R>$default$callable()), (tee$set ? tee$value : BuilderDefaultsGenerics.<N, T, R>$default$tee()), (arrr$set ? arrr$value : BuilderDefaultsGenerics.<N, T, R>$default$arrr()));
+      java.util.concurrent.Callable<N> callable$value = this.callable$value;
+      if ((! this.callable$set))
+          callable$value = BuilderDefaultsGenerics.<N, T, R>$default$callable();
+      T tee$value = this.tee$value;
+      if ((! this.tee$set))
+          tee$value = BuilderDefaultsGenerics.<N, T, R>$default$tee();
+      R arrr$value = this.arrr$value;
+      if ((! this.arrr$set))
+          arrr$value = BuilderDefaultsGenerics.<N, T, R>$default$arrr();
+      return new BuilderDefaultsGenerics<N, T, R>(callable$value, tee$value, arrr$value);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((("BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder(callable$value=" + this.callable$value) + ", tee$value=") + this.tee$value) + ", arrr$value=") + this.arrr$value) + ")");

test/transform/resource/after-ecj/BuilderDefaultsWarnings.java

@@ -45,7 +45,7 @@ public @Builder class BuilderDefaultsWarnings {
       default :
           items = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.items));
       }
-      return new BuilderDefaultsWarnings(x, z, items);
+      return new BuilderDefaultsWarnings(this.x, this.z, items);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((("BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder(x=" + this.x) + ", z=") + this.z) + ", items=") + this.items) + ")");

test/transform/resource/after-ecj/BuilderGenericMethod.java

@@ -17,7 +17,7 @@ class BuilderGenericMethod<T> {
       return this;
     }
     public @java.lang.SuppressWarnings("all") Map<N, T> build() {
-      return BuilderGenericMethod.this.<N>foo(a, b);
+      return BuilderGenericMethod.this.<N>foo(this.a, this.b);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((("BuilderGenericMethod.MapBuilder(a=" + this.a) + ", b=") + this.b) + ")");

test/transform/resource/after-ecj/BuilderInstanceMethod.java

@@ -25,7 +25,7 @@ class BuilderInstanceMethod<T> {
       return this;
     }
     public @java.lang.SuppressWarnings("all") String build() {
-      return BuilderInstanceMethod.this.create(show, yes, also, $andMe);
+      return BuilderInstanceMethod.this.create(this.show, this.yes, this.also, this.$andMe);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((((("BuilderInstanceMethod.StringBuilder(show=" + this.show) + ", yes=") + this.yes) + ", also=") + this.also) + ", $andMe=") + this.$andMe) + ")");

test/transform/resource/after-ecj/BuilderJavadoc.java

@@ -25,7 +25,7 @@ import java.util.List;
       return this;
     }
     public @java.lang.SuppressWarnings("all") BuilderJavadoc<T> build() {
-      return new BuilderJavadoc<T>(basic, getsetwith, predef, predefWithJavadoc);
+      return new BuilderJavadoc<T>(this.basic, this.getsetwith, this.predef, this.predefWithJavadoc);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((((("BuilderJavadoc.BuilderJavadocBuilder(basic=" + this.basic) + ", getsetwith=") + this.getsetwith) + ", predef=") + this.predef) + ", predefWithJavadoc=") + this.predefWithJavadoc) + ")");

test/transform/resource/after-ecj/BuilderSimple.java

@@ -15,7 +15,7 @@ import java.util.List;
       return this;
     }
     public @java.lang.SuppressWarnings("all") BuilderSimple<T> build() {
-      return new BuilderSimple<T>(yes, also);
+      return new BuilderSimple<T>(this.yes, this.also);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((("BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes) + ", also=") + this.also) + ")");

test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java

@@ -10,7 +10,7 @@ import java.util.List;
       return this;
     }
     public @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefix<T> build() {
-      return new BuilderSimpleWithSetterPrefix<T>(unprefixed);
+      return new BuilderSimpleWithSetterPrefix<T>(this.unprefixed);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (("BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder(unprefixed=" + this.unprefixed) + ")");

test/transform/resource/after-ecj/BuilderTypeAnnos.java

@@ -16,7 +16,7 @@ import java.util.List;
       return this;
     }
     public @java.lang.SuppressWarnings("all") BuilderTypeAnnos build() {
-      return new BuilderTypeAnnos(foo);
+      return new BuilderTypeAnnos(this.foo);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (("BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo) + ")");

test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java

@@ -16,7 +16,7 @@ import java.util.List;
       return this;
     }
     public @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefix build() {
-      return new BuilderTypeAnnosWithSetterPrefix(foo);
+      return new BuilderTypeAnnosWithSetterPrefix(this.foo);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (("BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder(foo=" + this.foo) + ")");

test/transform/resource/after-ecj/BuilderWithAccessors.java

@@ -24,7 +24,7 @@
       return this;
     }
     public @java.lang.SuppressWarnings("all") BuilderWithAccessors build() {
-      return new BuilderWithAccessors(plower, upper, foo, _bar);
+      return new BuilderWithAccessors(this.plower, this.upper, this.foo, this._bar);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((((("BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower) + ", upper=") + this.upper) + ", foo=") + this.foo) + ", _bar=") + this._bar) + ")");

test/transform/resource/after-ecj/BuilderWithBadNames.java

@@ -14,7 +14,7 @@ public @lombok.Builder class BuilderWithBadNames {
       return this;
     }
     public @java.lang.SuppressWarnings("all") BuilderWithBadNames build() {
-      return new BuilderWithBadNames(build, toString);
+      return new BuilderWithBadNames(this.build, this.toString);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((("BuilderWithBadNames.BuilderWithBadNamesBuilder(build=" + this.build) + ", toString=") + this.toString) + ")");

test/transform/resource/after-ecj/BuilderWithDeprecated.java

@@ -64,7 +64,7 @@ public @Builder class BuilderWithDeprecated {
           strings = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.strings));
       }
       com.google.common.collect.ImmutableList<Integer> numbers = ((this.numbers == null) ? com.google.common.collect.ImmutableList.<Integer>of() : this.numbers.build());
-      return new BuilderWithDeprecated(dep1, dep2, strings, numbers);
+      return new BuilderWithDeprecated(this.dep1, this.dep2, strings, numbers);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((((("BuilderWithDeprecated.BuilderWithDeprecatedBuilder(dep1=" + this.dep1) + ", dep2=") + this.dep2) + ", strings=") + this.strings) + ", numbers=") + this.numbers) + ")");

test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java

@@ -18,7 +18,7 @@ class BuilderWithExistingBuilderClass<T, K extends Number> {
       return this;
     }
     public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClass<String, Z> build() {
-      return BuilderWithExistingBuilderClass.<Z>staticMethod(arg1, arg2, arg3);
+      return BuilderWithExistingBuilderClass.<Z>staticMethod(this.arg1, this.arg2, this.arg3);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((("BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ")");

test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java

@@ -18,7 +18,7 @@ class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> {
       return this;
     }
     public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefix<String, Z> build() {
-      return BuilderWithExistingBuilderClassWithSetterPrefix.<Z>staticMethod(arg1, arg2, arg3);
+      return BuilderWithExistingBuilderClassWithSetterPrefix.<Z>staticMethod(this.arg1, this.arg2, this.arg3);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((("BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder(arg1=" + this.arg1) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ")");

test/transform/resource/after-ecj/BuilderWithNoBuilderMethod.java

@@ -10,7 +10,7 @@ import lombok.Builder;
       return this;
     }
     public @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethod build() {
-      return new BuilderWithNoBuilderMethod(a);
+      return new BuilderWithNoBuilderMethod(this.a);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (("BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder(a=" + this.a) + ")");

test/transform/resource/after-ecj/BuilderWithNonNull.java

@@ -13,7 +13,7 @@
       return this;
     }
     public @java.lang.SuppressWarnings("all") BuilderWithNonNull build() {
-      return new BuilderWithNonNull(id);
+      return new BuilderWithNonNull(this.id);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (("BuilderWithNonNull.BuilderWithNonNullBuilder(id=" + this.id) + ")");

test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java

@@ -13,7 +13,7 @@
       return this;
     }
     public @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefix build() {
-      return new BuilderWithNonNullWithSetterPrefix(id);
+      return new BuilderWithNonNullWithSetterPrefix(this.id);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (("BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder(id=" + this.id) + ")");

test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java

@@ -20,7 +20,7 @@ public class BuilderWithRecursiveGenerics {
         return this;
       }
       public @java.lang.SuppressWarnings("all") BuilderWithRecursiveGenerics.Test<Foo, Bar, Quz> build() {
-        return new BuilderWithRecursiveGenerics.Test<Foo, Bar, Quz>(foo, bar);
+        return new BuilderWithRecursiveGenerics.Test<Foo, Bar, Quz>(this.foo, this.bar);
       }
       public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
         return (((("BuilderWithRecursiveGenerics.Test.TestBuilder(foo=" + this.foo) + ", bar=") + this.bar) + ")");

test/transform/resource/after-ecj/BuilderWithToBuilder.java

@@ -50,7 +50,7 @@ import lombok.Builder;
       default :
           bars = java.util.Collections.unmodifiableList(new java.util.ArrayList<T>(this.bars));
       }
-      return new BuilderWithToBuilder<T>(one, two, foo, bars);
+      return new BuilderWithToBuilder<T>(this.one, this.two, this.foo, bars);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((((("BuilderWithToBuilder.BuilderWithToBuilderBuilder(one=" + this.one) + ", two=") + this.two) + ", foo=") + this.foo) + ", bars=") + this.bars) + ")");
@@ -101,7 +101,7 @@ import lombok.Builder;
       return this;
     }
     public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder<T> build() {
-      return new ConstructorWithToBuilder<T>(mOne, baz, bars);
+      return new ConstructorWithToBuilder<T>(this.mOne, this.baz, this.bars);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((("ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne) + ", baz=") + this.baz) + ", bars=") + this.bars) + ")");

test/transform/resource/after-ecj/BuilderWithTolerate.java

@@ -14,7 +14,7 @@ public @Builder class BuilderWithTolerate {
       return this;
     }
     public @java.lang.SuppressWarnings("all") BuilderWithTolerate build() {
-      return new BuilderWithTolerate(value);
+      return new BuilderWithTolerate(this.value);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (("BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value) + ")");

test/transform/resource/after-ecj/CheckerFrameworkBuilder.java

@@ -53,7 +53,10 @@ import lombok.Singular;
       default :
           names = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.names));
       }
-      return new CheckerFrameworkBuilder((x$set ? x$value : CheckerFrameworkBuilder.$default$x()), y, z, names);
+      int x$value = this.x$value;
+      if ((! this.x$set))
+          x$value = CheckerFrameworkBuilder.$default$x();
+      return new CheckerFrameworkBuilder(x$value, this.y, this.z, names);
     }
     public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((((("CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder(x$value=" + this.x$value) + ", y=") + this.y) + ", z=") + this.z) + ", names=") + this.names) + ")");

test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java

@@ -20,7 +20,10 @@ final @NoArgsConstructor(force = true) @AllArgsConstructor @Builder @Value class
       return this;
     }
     public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults build() {
-      return new ConstructorsWithBuilderDefaults((x$set ? x$value : ConstructorsWithBuilderDefaults.$default$x()), y);
+      int x$value = this.x$value;
+      if ((! this.x$set))
+          x$value = ConstructorsWithBuilderDefaults.$default$x();
+      return new ConstructorsWithBuilderDefaults(x$value, this.y);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((("ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(x$value=" + this.x$value) + ", y=") + this.y) + ")");

test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java

@@ -26,7 +26,13 @@ final @Builder @Value class ConstructorsWithBuilderDefaults<T> {
       return this;
     }
     public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults<T> build() {
-      return new ConstructorsWithBuilderDefaults<T>((z$set ? z$value : ConstructorsWithBuilderDefaults.<T>$default$z()), (x$set ? x$value : ConstructorsWithBuilderDefaults.<T>$default$x()), q);
+      java.util.List<T> z$value = this.z$value;
+      if ((! this.z$set))
+          z$value = ConstructorsWithBuilderDefaults.<T>$default$z();
+      T x$value = this.x$value;
+      if ((! this.x$set))
+          x$value = ConstructorsWithBuilderDefaults.<T>$default$x();
+      return new ConstructorsWithBuilderDefaults<T>(z$value, x$value, this.q);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (((((("ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(z$value=" + this.z$value) + ", x$value=") + this.x$value) + ", q=") + this.q) + ")");

test/transform/resource/after-ecj/JacksonJsonProperty.java

@@ -14,7 +14,7 @@ public @Builder class JacksonJsonProperty {
       return this;
     }
     public @java.lang.SuppressWarnings("all") JacksonJsonProperty build() {
-      return new JacksonJsonProperty(kebabCaseProp);
+      return new JacksonJsonProperty(this.kebabCaseProp);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (("JacksonJsonProperty.JacksonJsonPropertyBuilder(kebabCaseProp=" + this.kebabCaseProp) + ")");