tiennm99/lombok
1
0 Fork 0
mirror of https://github.com/tiennm99/lombok.git synced 2026-10-15 14:16:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fixes #3014] Detecting whether inner classes are static wouldn't work if placed inside an enum or interface.

Browse Source
This commit is contained in:
Reinier Zwitserloot committed 2021-10-26 04:14:46 +02:00
1 parent c359a4b41f
commit 3a0176fd90
5 files changed
+149 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/core/lombok/eclipse/EclipseNode.java
+6 -3
View File
@@ -215,13 +215,16 @@ public class EclipseNode extends lombok.core.LombokNode<EclipseAST, EclipseNode,
@Override public boolean isStatic() {
if (node instanceof TypeDeclaration) {
TypeDeclaration t = (TypeDeclaration) node;
int f = t.modifiers;
if (((ClassFileConstants.AccInterface | ClassFileConstants.AccEnum) & f) != 0) return true;
EclipseNode directUp = directUp();
if (directUp == null || directUp.getKind() == Kind.COMPILATION_UNIT) return true;
if (!(directUp.get() instanceof TypeDeclaration)) return false;
TypeDeclaration p = (TypeDeclaration) directUp.get();
int f = p.modifiers;
if ((ClassFileConstants.AccInterface & f) != 0) return true;
if ((ClassFileConstants.AccEnum & f) != 0) return true;
f = p.modifiers;
if (((ClassFileConstants.AccInterface | ClassFileConstants.AccEnum) & f) != 0) return true;
}
if (node instanceof FieldDeclaration) {
src/core/lombok/javac/JavacNode.java
+5 -3
View File
@@ -286,13 +286,15 @@ public class JavacNode extends lombok.core.LombokNode<JavacAST, JavacNode, JCTre
@Override public boolean isStatic() {
if (node instanceof JCClassDecl) {
JCClassDecl t = (JCClassDecl) node;
long f = t.mods.flags;
if (((Flags.INTERFACE | Flags.ENUM) & f) != 0) return true;
JavacNode directUp = directUp();
if (directUp == null || directUp.getKind() == Kind.COMPILATION_UNIT) return true;
if (!(directUp.get() instanceof JCClassDecl)) return false;
JCClassDecl p = (JCClassDecl) directUp.get();
long f = p.mods.flags;
if ((Flags.INTERFACE & f) != 0) return true;
if ((Flags.ENUM & f) != 0) return true;
f = p.mods.flags;
if (((Flags.INTERFACE | Flags.ENUM) & f) != 0) return true;
}
if (node instanceof JCVariableDecl) {
test/core/src/lombok/DirectoryRunner.java
-1
View File
@@ -40,7 +40,6 @@ import lombok.javac.Javac;
public class DirectoryRunner extends Runner {
/** 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(
"BuilderNestedInEnum.java"
);
public enum Compiler {
test/transform/resource/after-delombok/BuilderNestedInEnum.java
+70
View File
@@ -0,0 +1,70 @@
class BuilderNestedInEnum {
public enum TestEnum {
FOO, BAR;
public static final class TestBuilder {
private final String field;
@java.lang.SuppressWarnings("all")
TestBuilder(final String field) {
this.field = field;
}
@java.lang.SuppressWarnings("all")
public static class TestBuilderBuilder {
@java.lang.SuppressWarnings("all")
private String field;
@java.lang.SuppressWarnings("all")
TestBuilderBuilder() {
}
/**
* @return {@code this}.
*/
@java.lang.SuppressWarnings("all")
public BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder field(final String field) {
this.field = field;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderNestedInEnum.TestEnum.TestBuilder build() {
return new BuilderNestedInEnum.TestEnum.TestBuilder(this.field);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder(field=" + this.field + ")";
}
}
@java.lang.SuppressWarnings("all")
public static BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder builder() {
return new BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder();
}
@java.lang.SuppressWarnings("all")
public String getField() {
return this.field;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public boolean equals(final java.lang.Object o) {
if (o == this) return true;
if (!(o instanceof BuilderNestedInEnum.TestEnum.TestBuilder)) return false;
final BuilderNestedInEnum.TestEnum.TestBuilder other = (BuilderNestedInEnum.TestEnum.TestBuilder) o;
final java.lang.Object this$field = this.getField();
final java.lang.Object other$field = other.getField();
if (this$field == null ? other$field != null : !this$field.equals(other$field)) return false;
return true;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public int hashCode() {
final int PRIME = 59;
int result = 1;
final java.lang.Object $field = this.getField();
result = result * PRIME + ($field == null ? 43 : $field.hashCode());
return result;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderNestedInEnum.TestEnum.TestBuilder(field=" + this.getField() + ")";
}
}
}
}
test/transform/resource/after-ecj/BuilderNestedInEnum.java
+68
View File
@@ -0,0 +1,68 @@
class BuilderNestedInEnum {
public enum TestEnum {
public static final @lombok.Builder @lombok.Value class TestBuilder {
public static @java.lang.SuppressWarnings("all") class TestBuilderBuilder {
private @java.lang.SuppressWarnings("all") String field;
@java.lang.SuppressWarnings("all") TestBuilderBuilder() {
super();
}
/**
* @return {@code this}.
*/
public @java.lang.SuppressWarnings("all") BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder field(final String field) {
this.field = field;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderNestedInEnum.TestEnum.TestBuilder build() {
return new BuilderNestedInEnum.TestEnum.TestBuilder(this.field);
}
public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
return (("BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder(field=" + this.field) + ")");
}
}
private final String field;
@java.lang.SuppressWarnings("all") TestBuilder(final String field) {
super();
this.field = field;
}
public static @java.lang.SuppressWarnings("all") BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder builder() {
return new BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder();
}
public @java.lang.SuppressWarnings("all") String getField() {
return this.field;
}
public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
if ((o == this))
return true;
if ((! (o instanceof BuilderNestedInEnum.TestEnum.TestBuilder)))
return false;
final BuilderNestedInEnum.TestEnum.TestBuilder other = (BuilderNestedInEnum.TestEnum.TestBuilder) o;
final java.lang.Object this$field = this.getField();
final java.lang.Object other$field = other.getField();
if (((this$field == null) ? (other$field != null) : (! this$field.equals(other$field))))
return false;
return true;
}
public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
final int PRIME = 59;
int result = 1;
final java.lang.Object $field = this.getField();
result = ((result * PRIME) + (($field == null) ? 43 : $field.hashCode()));
return result;
}
public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
return (("BuilderNestedInEnum.TestEnum.TestBuilder(field=" + this.getField()) + ")");
}
}
FOO(),
BAR(),
<clinit>() {
}
public TestEnum() {
super();
}
}
BuilderNestedInEnum() {
super();
}
}