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

Move invariant parameter inside finishAndInjectMethod

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

No files matched your search

src/core/lombok/javac/handlers/JavacSingularsRecipes.java
+4 -5
View File
@@ -241,7 +241,8 @@ public class JavacSingularsRecipes {
generateClearMethod(deprecate, maker, returnTypeMaker.make(), returnStatementMaker.make(), data, builderType, source);
}
protected void finishAndInjectMethod(JavacTreeMaker maker, JCExpression returnType, JavacNode builderType, JCTree source, JCModifiers mods, JCBlock body, Name methodName, List<JCVariableDecl> jcVariableDecls) {
protected void finishAndInjectMethod(JavacTreeMaker maker, JCExpression returnType, JavacNode builderType, JCTree source, boolean deprecate, JCBlock body, Name methodName, List<JCVariableDecl> jcVariableDecls) {
JCModifiers mods = makeMods(maker, builderType, deprecate);
List<JCTypeParameter> typeParams = List.nil();
List<JCExpression> thrown = List.nil();
JCMethodDecl method = maker.MethodDef(mods, methodName, returnType, typeParams, jcVariableDecls, thrown, body, null);
@@ -258,8 +259,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);
finishAndInjectMethod(maker, returnType, builderType, source, deprecate, body, methodName, params);
}
protected abstract JCStatement generateClearStatements(JavacTreeMaker maker, SingularData data, JavacNode builderType);
@@ -272,8 +272,7 @@ public class JavacSingularsRecipes {
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);
finishAndInjectMethod(maker, returnType, builderType, source, deprecate, body, name, params);
}
protected JCVariableDecl generateSingularMethodParameter(int typeIndex, JavacTreeMaker maker, SingularData data, JavacNode builderType, JCTree source, Name name) {
src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java
+1 -2
View File
@@ -139,8 +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));
finishAndInjectMethod(maker, returnType, builderType, source, deprecate, body, methodName, List.of(param));
}
@Override public void appendBuildCode(SingularData data, JavacNode builderType, JCTree source, ListBuffer<JCStatement> statements, Name targetVariableName, String builderVariable) {
src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSetSingularizer.java
+1 -2
View File
@@ -125,8 +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));
finishAndInjectMethod(maker, returnType, builderType, source, deprecate, body, name, List.of(param));
}
@Override
src/core/lombok/javac/handlers/singulars/JavacJavaUtilMapSingularizer.java
+1 -2
View File
@@ -173,8 +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));
finishAndInjectMethod(maker, returnType, builderType, source, deprecate, body, name, List.of(param));
}
@Override public void appendBuildCode(SingularData data, JavacNode builderType, JCTree source, ListBuffer<JCStatement> statements, Name targetVariableName, String builderVariable) {