aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/lombok/eclipse/EclipseAST.java17
-rw-r--r--src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java91
-rwxr-xr-xsrc/core/lombok/eclipse/handlers/HandleBuilder.java6
-rwxr-xr-xsrc/core/lombok/eclipse/handlers/HandleConstructor.java7
-rw-r--r--src/core/lombok/eclipse/handlers/HandleData.java11
-rwxr-xr-xsrc/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java6
-rw-r--r--src/core/lombok/eclipse/handlers/HandleFieldDefaults.java8
-rw-r--r--src/core/lombok/eclipse/handlers/HandleGetter.java8
-rw-r--r--src/core/lombok/eclipse/handlers/HandleLog.java4
-rw-r--r--src/core/lombok/eclipse/handlers/HandleNonNull.java18
-rw-r--r--src/core/lombok/eclipse/handlers/HandleSetter.java8
-rw-r--r--src/core/lombok/eclipse/handlers/HandleSuperBuilder.java2
-rw-r--r--src/core/lombok/eclipse/handlers/HandleSynchronized.java7
-rw-r--r--src/core/lombok/eclipse/handlers/HandleToString.java10
-rw-r--r--src/core/lombok/eclipse/handlers/HandleUtilityClass.java9
-rw-r--r--src/core/lombok/eclipse/handlers/HandleValue.java5
-rw-r--r--src/core/lombok/eclipse/handlers/HandleWithBy.java7
-rw-r--r--src/core/lombok/javac/handlers/HandleBuilder.java4
-rw-r--r--src/core/lombok/javac/handlers/HandleConstructor.java7
-rw-r--r--src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java8
-rw-r--r--src/core/lombok/javac/handlers/HandleFieldDefaults.java7
-rw-r--r--src/core/lombok/javac/handlers/HandleGetter.java8
-rw-r--r--src/core/lombok/javac/handlers/HandleLog.java13
-rw-r--r--src/core/lombok/javac/handlers/HandleNonNull.java15
-rw-r--r--src/core/lombok/javac/handlers/HandleSetter.java7
-rw-r--r--src/core/lombok/javac/handlers/HandleSuperBuilder.java2
-rw-r--r--src/core/lombok/javac/handlers/HandleSynchronized.java8
-rw-r--r--src/core/lombok/javac/handlers/HandleToString.java8
-rw-r--r--src/core/lombok/javac/handlers/HandleUtilityClass.java9
-rw-r--r--src/core/lombok/javac/handlers/JavacHandlerUtil.java37
-rw-r--r--src/delombok/lombok/delombok/PrettyPrinter.java25
-rw-r--r--src/utils/lombok/eclipse/Eclipse.java13
-rw-r--r--src/utils/lombok/eclipse/Java14Bits.java11
-rw-r--r--src/utils/lombok/javac/Java14Flags.java26
-rw-r--r--test/core/src/lombok/RunTestsViaEcj.java2
-rw-r--r--test/transform/resource/after-delombok/BuilderSimpleOnRecord.java43
-rw-r--r--test/transform/resource/after-delombok/BuilderSingularOnRecord.java136
-rw-r--r--test/transform/resource/after-delombok/ConstructorsOnRecord.java2
-rw-r--r--test/transform/resource/after-delombok/DataOnRecord.java2
-rw-r--r--test/transform/resource/after-delombok/EqualsAndHashCodeOnRecord.java2
-rw-r--r--test/transform/resource/after-delombok/FieldDefaultsOnRecord.java2
-rw-r--r--test/transform/resource/after-delombok/FieldNameConstantsOnRecord.java9
-rw-r--r--test/transform/resource/after-delombok/GetterOnRecord.java2
-rw-r--r--test/transform/resource/after-delombok/LoggerConfigOnRecord.java2
-rw-r--r--test/transform/resource/after-delombok/LoggerSlf4jNonStaticOnRecord.java3
-rw-r--r--test/transform/resource/after-delombok/LoggerSlf4jOnRecord.java3
-rw-r--r--test/transform/resource/after-delombok/NonNullExistingConstructorOnRecord.java22
-rw-r--r--test/transform/resource/after-delombok/NonNullOnRecord.java22
-rw-r--r--test/transform/resource/after-delombok/SetterOnRecord.java2
-rw-r--r--test/transform/resource/after-delombok/SynchronizedInRecord.java6
-rw-r--r--test/transform/resource/after-delombok/ToStringOnRecord.java2
-rw-r--r--test/transform/resource/after-delombok/UtilityClassOnRecord.java2
-rw-r--r--test/transform/resource/after-delombok/ValueOnRecord.java2
-rw-r--r--test/transform/resource/after-delombok/WithByOnRecord.java6
-rw-r--r--test/transform/resource/after-delombok/WithOnRecord.java11
-rw-r--r--test/transform/resource/after-ecj/BuilderSimpleOnRecord.java34
-rw-r--r--test/transform/resource/after-ecj/BuilderSingularOnRecord.java128
-rw-r--r--test/transform/resource/after-ecj/ConstructorsOnRecord.java12
-rw-r--r--test/transform/resource/after-ecj/DataOnRecord.java10
-rw-r--r--test/transform/resource/after-ecj/EqualsAndHashCodeOnRecord.java10
-rw-r--r--test/transform/resource/after-ecj/FieldDefaultsOnRecord.java9
-rw-r--r--test/transform/resource/after-ecj/FieldNameConstantsOnRecord.java27
-rw-r--r--test/transform/resource/after-ecj/GetterOnRecord.java10
-rw-r--r--test/transform/resource/after-ecj/LoggerConfigOnRecord.java10
-rw-r--r--test/transform/resource/after-ecj/LoggerSlf4jOnRecord.java13
-rw-r--r--test/transform/resource/after-ecj/NonNullExistingConstructorOnRecord.java30
-rw-r--r--test/transform/resource/after-ecj/NonNullOnRecord.java30
-rw-r--r--test/transform/resource/after-ecj/SetterOnRecord.java10
-rw-r--r--test/transform/resource/after-ecj/SynchronizedInRecord.java14
-rw-r--r--test/transform/resource/after-ecj/ToStringOnRecord.java10
-rw-r--r--test/transform/resource/after-ecj/UtilityClassOnRecord.java10
-rw-r--r--test/transform/resource/after-ecj/ValueOnRecord.java10
-rw-r--r--test/transform/resource/after-ecj/WithByOnRecord.java13
-rw-r--r--test/transform/resource/after-ecj/WithOnRecord.java16
-rw-r--r--test/transform/resource/before/BuilderSimpleOnRecord.java7
-rw-r--r--test/transform/resource/before/BuilderSingularOnRecord.java11
-rw-r--r--test/transform/resource/before/ConstructorsOnRecord.java11
-rw-r--r--test/transform/resource/before/DataOnRecord.java7
-rw-r--r--test/transform/resource/before/EqualsAndHashCodeOnRecord.java7
-rw-r--r--test/transform/resource/before/FieldDefaultsOnRecord.java5
-rw-r--r--test/transform/resource/before/FieldNameConstantsOnRecord.java9
-rw-r--r--test/transform/resource/before/GetterOnRecord.java7
-rw-r--r--test/transform/resource/before/LoggerConfigOnRecord.java8
-rw-r--r--test/transform/resource/before/LoggerSlf4jOnRecord.java7
-rw-r--r--test/transform/resource/before/NonNullExistingConstructorOnRecord.java9
-rw-r--r--test/transform/resource/before/NonNullOnRecord.java9
-rw-r--r--test/transform/resource/before/SetterOnRecord.java7
-rw-r--r--test/transform/resource/before/SuperBuilderOnRecord.java8
-rw-r--r--test/transform/resource/before/SynchronizedInRecord.java10
-rw-r--r--test/transform/resource/before/ToStringOnRecord.java7
-rw-r--r--test/transform/resource/before/UtilityClassOnRecord.java7
-rw-r--r--test/transform/resource/before/ValueOnRecord.java7
-rw-r--r--test/transform/resource/before/WithByOnRecord.java6
-rw-r--r--test/transform/resource/before/WithOnRecord.java7
-rw-r--r--test/transform/resource/messages-delombok/ConstructorsOnRecord.java.messages3
-rw-r--r--test/transform/resource/messages-delombok/DataOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-delombok/EqualsAndHashCodeOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-delombok/FieldDefaultsOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-delombok/GetterOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-delombok/LoggerConfigOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-delombok/SetterOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-delombok/SuperBuilderOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-delombok/SynchronizedInRecord.java.messages1
-rw-r--r--test/transform/resource/messages-delombok/ToStringOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-delombok/UtilityClassErrors.java.messages2
-rw-r--r--test/transform/resource/messages-delombok/UtilityClassOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-delombok/ValueOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/ConstructorsOnRecord.java.messages3
-rw-r--r--test/transform/resource/messages-ecj/DataOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/EqualsAndHashCodeOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/FieldDefaultsOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/GetterOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/LoggerConfigOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/SetterOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/SuperBuilderOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/SynchronizedInRecord.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/ToStringOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/UtilityClassErrors.java.messages2
-rw-r--r--test/transform/resource/messages-ecj/UtilityClassOnRecord.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/ValueOnRecord.java.messages1
120 files changed, 1168 insertions, 141 deletions
diff --git a/src/core/lombok/eclipse/EclipseAST.java b/src/core/lombok/eclipse/EclipseAST.java
index d53856af..2c860e14 100644
--- a/src/core/lombok/eclipse/EclipseAST.java
+++ b/src/core/lombok/eclipse/EclipseAST.java
@@ -21,6 +21,8 @@
*/
package lombok.eclipse;
+import static lombok.eclipse.handlers.EclipseHandlerUtil.*;
+
import java.io.File;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -34,7 +36,6 @@ import java.util.List;
import lombok.Lombok;
import lombok.core.AST;
import lombok.core.LombokImmutableList;
-import lombok.eclipse.handlers.EclipseHandlerUtil;
import lombok.permit.Permit;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -117,7 +118,7 @@ public class EclipseAST extends AST<EclipseAST, EclipseNode, ASTNode> {
try {
return EclipseWorkspaceBasedFileResolver.resolve(fileName);
} catch (IllegalArgumentException e) {
- EclipseHandlerUtil.warning("Finding 'lombok.config' file failed for '" + fileName + "'", e);
+ warning("Finding 'lombok.config' file failed for '" + fileName + "'", e);
// String msg = e.getMessage();
// if (msg != null && msg.startsWith("Path must include project and resource name")) {
// // We shouldn't throw an exception at all, but we can't reproduce this so we need help from our users to figure this out.
@@ -362,7 +363,7 @@ public class EclipseAST extends AST<EclipseAST, EclipseNode, ASTNode> {
case TYPE:
return buildType((TypeDeclaration) node);
case FIELD:
- return buildField((FieldDeclaration) node);
+ return buildField((FieldDeclaration) node, null);
case INITIALIZER:
return buildInitializer((Initializer) node);
case METHOD: