diff options
| author | Rawi01 <Rawi01@users.noreply.github.com> | 2020-08-31 09:38:14 +0200 |
|---|---|---|
| committer | Rawi01 <Rawi01@users.noreply.github.com> | 2020-08-31 09:38:14 +0200 |
| commit | 23b80658bcf3ca0007a86d04ce6cc5f6c8db5ad4 (patch) | |
| tree | 5e159ce51df5436a7ab5aeb18c0edb0605a1c2f1 /src/core/lombok/eclipse/handlers | |
| parent | 2b4b5c983540af4a4c08cfb7a3d4057df0b84c39 (diff) | |
| parent | 9148294f78a8e646ee131ca182a9b692bc028fdb (diff) | |
| download | lombok-23b80658bcf3ca0007a86d04ce6cc5f6c8db5ad4.tar.gz lombok-23b80658bcf3ca0007a86d04ce6cc5f6c8db5ad4.tar.bz2 lombok-23b80658bcf3ca0007a86d04ce6cc5f6c8db5ad4.zip | |
Merge branch 'master' into eclipse-javadoc
Conflicts:
src/core/lombok/javac/handlers/JavacHandlerUtil.java
test/core/src/lombok/RunTestsViaEcj.java
Diffstat (limited to 'src/core/lombok/eclipse/handlers')
| -rw-r--r-- | src/core/lombok/eclipse/handlers/HandleFieldNameConstants.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/lombok/eclipse/handlers/HandleFieldNameConstants.java b/src/core/lombok/eclipse/handlers/HandleFieldNameConstants.java index 9343011f..cee3912c 100644 --- a/src/core/lombok/eclipse/handlers/HandleFieldNameConstants.java +++ b/src/core/lombok/eclipse/handlers/HandleFieldNameConstants.java @@ -171,10 +171,10 @@ public class HandleFieldNameConstants extends EclipseAnnotationHandler<FieldName injectMethod(fieldsType, constructor); } + Clinit cli = null; if (genClinit) { - Clinit cli = new Clinit(parent.compilationResult); + cli = new Clinit(parent.compilationResult); injectMethod(fieldsType, cli); - cli.traverse(generatedByVisitor, ((TypeDeclaration) fieldsType.get()).scope); } for (EclipseNode fieldNode : fields) { @@ -202,5 +202,9 @@ public class HandleFieldNameConstants extends EclipseAnnotationHandler<FieldName injectField(fieldsType, constantField); constantField.traverse(generatedByVisitor, ((TypeDeclaration) fieldsType.get()).initializerScope); } + + if (genClinit) { + cli.traverse(generatedByVisitor, ((TypeDeclaration) fieldsType.get()).scope); + } } } |