mirror of
https://github.com/tiennm99/lombok.git
synced 2026-10-14 16:17:34 +00:00
Move single-use variable declarations to just before use
This commit is contained in:
1 parent
fd7301117d
commit
0c20da8e0e
3 files changed
+3
-4
No files matched your search
@@ -90,7 +90,6 @@ abstract class JavacGuavaSingularizer extends JavacSingularizer {
|
||||
names[i] = s.isEmpty() ? n : builderType.toName(s);
|
||||
}
|
||||
|
||||
JCModifiers mods = makeMods(maker, builderType, deprecate);
|
||||
ListBuffer<JCStatement> statements = new ListBuffer<JCStatement>();
|
||||
statements.append(createConstructBuilderVarIfNeeded(maker, data, builderType, source));
|
||||
JCExpression thisDotFieldDotAdd = chainDots(builderType, "this", data.getPluralName().toString(), getAddMethodName());
|
||||
@@ -108,6 +107,7 @@ abstract class JavacGuavaSingularizer extends JavacSingularizer {
|
||||
params.append(generateSingularMethodParameter(i, maker, data, builderType, source, names[i]));
|
||||
}
|
||||
|
||||
JCModifiers mods = makeMods(maker, builderType, deprecate);
|
||||
finishAndInjectSingularMethod(maker, returnType, returnStatement, data, builderType, source, fluent, mods, statements, params.toList(), getAddMethodName());
|
||||
}
|
||||
|
||||
|
||||
@@ -98,7 +98,6 @@ abstract class JavacJavaUtilListSetSingularizer extends JavacJavaUtilSingularize
|
||||
|
||||
@Override
|
||||
protected void generateSingularMethod(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));
|
||||
statements.append(generateSingularMethodAddStatement(maker, builderType, data.getSingularName(), data.getPluralName().toString()));
|
||||
@@ -106,6 +105,7 @@ abstract class JavacJavaUtilListSetSingularizer extends JavacJavaUtilSingularize
|
||||
JCVariableDecl param = generateSingularMethodParameter(0, maker, data, builderType, source, data.getSingularName());
|
||||
List<JCVariableDecl> params = List.of(param);
|
||||
|
||||
JCModifiers mods = makeMods(maker, builderType, deprecate);
|
||||
finishAndInjectSingularMethod(maker, returnType, returnStatement, data, builderType, source, fluent, mods, statements, params, "add");
|
||||
}
|
||||
|
||||
|
||||
@@ -125,8 +125,6 @@ public class JavacJavaUtilMapSingularizer extends JavacJavaUtilSingularizer {
|
||||
|
||||
@Override
|
||||
protected void generateSingularMethod(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, true, source));
|
||||
Name keyName = builderType.toName(data.getSingularName().toString() + "Key");
|
||||
@@ -141,6 +139,7 @@ public class JavacJavaUtilMapSingularizer extends JavacJavaUtilSingularizer {
|
||||
JCVariableDecl paramValue = generateSingularMethodParameter(1, maker, data, builderType, source, valueName);
|
||||
List<JCVariableDecl> params = List.of(paramKey, paramValue);
|
||||
|
||||
JCModifiers mods = makeMods(maker, builderType, deprecate);
|
||||
finishAndInjectSingularMethod(maker, returnType, returnStatement, data, builderType, source, fluent, mods, statements, params, "put");
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user