diff options
| author | Emil Lundberg <emil@emlun.se> | 2019-01-10 02:04:15 +0100 |
|---|---|---|
| committer | Emil Lundberg <emil@emlun.se> | 2019-01-13 02:13:54 +0100 |
| commit | 62bb81311e58f6ec1108e94bc4f61bbf93eb411a (patch) | |
| tree | 0f27660892fddc8bbed1586f953c18f5694b961d /src/core/lombok/javac/handlers/JavacSingularsRecipes.java | |
| parent | d08aa5a83d2302eaaf84c4323073dfe3edd43703 (diff) | |
| download | lombok-62bb81311e58f6ec1108e94bc4f61bbf93eb411a.tar.gz lombok-62bb81311e58f6ec1108e94bc4f61bbf93eb411a.tar.bz2 lombok-62bb81311e58f6ec1108e94bc4f61bbf93eb411a.zip | |
Pull return statement wrapping up into generateClearMethod
Diffstat (limited to 'src/core/lombok/javac/handlers/JavacSingularsRecipes.java')
| -rw-r--r-- | src/core/lombok/javac/handlers/JavacSingularsRecipes.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/lombok/javac/handlers/JavacSingularsRecipes.java b/src/core/lombok/javac/handlers/JavacSingularsRecipes.java index 765d7e43..eed21af4 100644 --- a/src/core/lombok/javac/handlers/JavacSingularsRecipes.java +++ b/src/core/lombok/javac/handlers/JavacSingularsRecipes.java @@ -248,7 +248,8 @@ public class JavacSingularsRecipes { List<JCExpression> thrown = List.nil(); List<JCVariableDecl> params = List.nil(); - List<JCStatement> statements = generateClearStatements(maker, returnStatement, data, builderType); + JCStatement clearStatement = generateClearStatements(maker, data, builderType); + List<JCStatement> statements = returnStatement != null ? List.of(clearStatement, returnStatement) : List.of(clearStatement); JCBlock body = maker.Block(0, statements); Name methodName = builderType.toName(HandlerUtil.buildAccessorName("clear", data.getPluralName().toString())); @@ -257,7 +258,7 @@ public class JavacSingularsRecipes { injectMethod(builderType, method); } - protected abstract List<JCStatement> generateClearStatements(JavacTreeMaker maker, JCStatement returnStatement, SingularData data, JavacNode builderType); + protected abstract JCStatement generateClearStatements(JavacTreeMaker maker, SingularData data, JavacNode builderType); protected abstract void generateSingularMethod(boolean deprecate, JavacTreeMaker maker, JCExpression returnType, JCStatement returnStatement, SingularData data, JavacNode builderType, JCTree source, boolean fluent); |