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

Move single-use variable declarations to just before use

Browse Source
This commit is contained in:
Emil Lundberg committed 2019-01-13 02:26:56 +01:00
1 parent 1eaa6da816
commit 36653329e5
4 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/core/lombok/javac/handlers/JavacSingularsRecipes.java
+2 -2
View File
@@ -250,7 +250,6 @@ public class JavacSingularsRecipes {
}
protected void generateClearMethod(boolean deprecate, JavacTreeMaker maker, JCExpression returnType, JCStatement returnStatement, SingularData data, JavacNode builderType, JCTree source) {
JCModifiers mods = makeMods(maker, builderType, deprecate);
List<JCVariableDecl> params = List.nil();
@@ -259,6 +258,7 @@ public class JavacSingularsRecipes {
JCBlock body = maker.Block(0, statements);
Name methodName = builderType.toName(HandlerUtil.buildAccessorName("clear", data.getPluralName().toString()));
JCModifiers mods = makeMods(maker, builderType, deprecate);
finishAndInjectMethod(maker, returnType, builderType, source, mods, body, methodName, params);
}
@@ -267,12 +267,12 @@ public class JavacSingularsRecipes {
void generateSingularMethod(boolean deprecate, JavacTreeMaker maker, JCExpression returnType, JCStatement returnStatement, SingularData data, JavacNode builderType, JCTree source, boolean fluent) {
ListBuffer<JCStatement> statements = generateSingularMethodStatements(maker, data, builderType, source);
List<JCVariableDecl> params = generateSingularMethodParameters(maker, data, builderType, source);
JCModifiers mods = makeMods(maker, builderType, deprecate);
if (returnStatement != null) statements.append(returnStatement);
JCBlock body = maker.Block(0, statements.toList());
Name name = data.getSingularName();
if (!fluent) name = builderType.toName(HandlerUtil.buildAccessorName(getAddMethodName(), name.toString()));
JCModifiers mods = makeMods(maker, builderType, deprecate);
finishAndInjectMethod(maker, returnType, builderType, source, mods, body, name, params);
}
src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java
+1 -1
View File
@@ -120,7 +120,6 @@ abstract class JavacGuavaSingularizer extends JavacSingularizer {
@Override
protected void generatePluralMethod(boolean deprecate, JavacTreeMaker maker, JCExpression returnType, JCStatement returnStatement, SingularData data, JavacNode builderType, JCTree source, boolean fluent) {
JCModifiers mods = makeMods(maker, builderType, deprecate);
ListBuffer<JCStatement> statements = new ListBuffer<JCStatement>();
statements.append(createConstructBuilderVarIfNeeded(maker, data, builderType, source));
JCExpression thisDotFieldDotAddAll = chainDots(builderType, "this", data.getPluralName().toString(), getAddMethodName() + "All");
@@ -140,6 +139,7 @@ abstract class JavacGuavaSingularizer extends JavacSingularizer {
}
paramType = addTypeArgs(getTypeArgumentsCount(), true, builderType, paramType, data.getTypeArgs(), source);
JCVariableDecl param = maker.VarDef(maker.Modifiers(paramFlags), data.getPluralName(), paramType, null);
JCModifiers mods = makeMods(maker, builderType, deprecate);
finishAndInjectMethod(maker, returnType, builderType, source, mods, body, methodName, List.of(param));
}
src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSetSingularizer.java
+1 -1
View File
@@ -112,7 +112,6 @@ abstract class JavacJavaUtilListSetSingularizer extends JavacJavaUtilSingularize
@Override
protected void generatePluralMethod(boolean deprecate, JavacTreeMaker maker, JCExpression returnType, JCStatement returnStatement, SingularData data, JavacNode builderType, JCTree source, boolean fluent) {
JCModifiers mods = makeMods(maker, builderType, deprecate);
ListBuffer<JCStatement> statements = new ListBuffer<JCStatement>();
statements.append(createConstructBuilderVarIfNeeded(maker, data, builderType, false, source));
JCExpression thisDotFieldDotAdd = chainDots(builderType, "this", data.getPluralName().toString(), "addAll");
@@ -126,6 +125,7 @@ abstract class JavacJavaUtilListSetSingularizer extends JavacJavaUtilSingularize
JCExpression paramType = chainDots(builderType, "java", "util", "Collection");
paramType = addTypeArgs(1, true, builderType, paramType, data.getTypeArgs(), source);
JCVariableDecl param = maker.VarDef(maker.Modifiers(paramFlags), data.getPluralName(), paramType, null);
JCModifiers mods = makeMods(maker, builderType, deprecate);
finishAndInjectMethod(maker, returnType, builderType, source, mods, body, name, List.of(param));
}
src/core/lombok/javac/handlers/singulars/JavacJavaUtilMapSingularizer.java
+1 -1
View File
@@ -149,7 +149,6 @@ public class JavacJavaUtilMapSingularizer extends JavacJavaUtilSingularizer {
@Override
protected void generatePluralMethod(boolean deprecate, JavacTreeMaker maker, JCExpression returnType, JCStatement returnStatement, SingularData data, JavacNode builderType, JCTree source, boolean fluent) {
List<JCExpression> jceBlank = List.nil();
JCModifiers mods = makeMods(maker, builderType, deprecate);
ListBuffer<JCStatement> statements = new ListBuffer<JCStatement>();
statements.append(createConstructBuilderVarIfNeeded(maker, data, builderType, true, source));
long paramFlags = JavacHandlerUtil.addFinalIfNeeded(Flags.PARAMETER, builderType.getContext());
@@ -174,6 +173,7 @@ public class JavacJavaUtilMapSingularizer extends JavacJavaUtilSingularizer {
JCExpression paramType = chainDots(builderType, "java", "util", "Map");
paramType = addTypeArgs(2, true, builderType, paramType, data.getTypeArgs(), source);
JCVariableDecl param = maker.VarDef(maker.Modifiers(paramFlags), data.getPluralName(), paramType, null);
JCModifiers mods = makeMods(maker, builderType, deprecate);
finishAndInjectMethod(maker, returnType, builderType, source, mods, body, name, List.of(param));
}