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

Move invariant parameter inside generateSingularMethodParameter

Browse Source
This commit is contained in:
Emil Lundberg committed 2019-01-13 02:20:03 +01:00
1 parent a367f7815d
commit 2747ce6a2c
4 files changed
+6 -8
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 -1
View File
@@ -266,7 +266,8 @@ public class JavacSingularsRecipes {
protected abstract void generateSingularMethod(boolean deprecate, JavacTreeMaker maker, JCExpression returnType, JCStatement returnStatement, SingularData data, JavacNode builderType, JCTree source, boolean fluent);
protected JCVariableDecl generateSingularMethodParameter(int typeIndex, JavacTreeMaker maker, SingularData data, JavacNode builderType, JCTree source, Name name, long flags) {
protected JCVariableDecl generateSingularMethodParameter(int typeIndex, JavacTreeMaker maker, SingularData data, JavacNode builderType, JCTree source, Name name) {
long flags = JavacHandlerUtil.addFinalIfNeeded(Flags.PARAMETER, builderType.getContext());
JCExpression type = cloneParamType(typeIndex, maker, data.getTypeArgs(), builderType, source);
List<JCAnnotation> typeUseAnns = getTypeUseAnnotations(type);
type = removeTypeUseAnnotations(type);
src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java
+1 -2
View File
@@ -107,8 +107,7 @@ abstract class JavacGuavaSingularizer extends JavacSingularizer {
if (!fluent) methodName = builderType.toName(HandlerUtil.buildAccessorName(getAddMethodName(), methodName.toString()));
ListBuffer<JCVariableDecl> params = new ListBuffer<JCVariableDecl>();
for (int i = 0; i < suffixes.size(); i++) {
long paramFlags = JavacHandlerUtil.addFinalIfNeeded(Flags.PARAMETER, builderType.getContext());
params.append(generateSingularMethodParameter(i, maker, data, builderType, source, names[i], paramFlags));
params.append(generateSingularMethodParameter(i, maker, data, builderType, source, names[i]));
}
finishAndInjectMethod(maker, returnType, builderType, source, mods, body, methodName, params.toList());
src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSetSingularizer.java
+1 -2
View File
@@ -110,8 +110,7 @@ abstract class JavacJavaUtilListSetSingularizer extends JavacJavaUtilSingularize
if (!fluent) name = builderType.toName(HandlerUtil.buildAccessorName("add", name.toString()));
Name paramName = data.getSingularName();
long paramFlags = JavacHandlerUtil.addFinalIfNeeded(Flags.PARAMETER, builderType.getContext());
JCVariableDecl param = generateSingularMethodParameter(0, maker, data, builderType, source, paramName, paramFlags);
JCVariableDecl param = generateSingularMethodParameter(0, maker, data, builderType, source, paramName);
finishAndInjectMethod(maker, returnType, builderType, source, mods, body, name, List.of(param));
}
src/core/lombok/javac/handlers/singulars/JavacJavaUtilMapSingularizer.java
+2 -3
View File
@@ -148,9 +148,8 @@ public class JavacJavaUtilMapSingularizer extends JavacJavaUtilSingularizer {
Name name = data.getSingularName();
if (!fluent) name = builderType.toName(HandlerUtil.buildAccessorName("put", name.toString()));
long paramFlags = JavacHandlerUtil.addFinalIfNeeded(Flags.PARAMETER, builderType.getContext());
JCVariableDecl paramKey = generateSingularMethodParameter(0, maker, data, builderType, source, keyName, paramFlags);
JCVariableDecl paramValue = generateSingularMethodParameter(1, maker, data, builderType, source, valueName, paramFlags);
JCVariableDecl paramKey = generateSingularMethodParameter(0, maker, data, builderType, source, keyName);
JCVariableDecl paramValue = generateSingularMethodParameter(1, maker, data, builderType, source, valueName);
finishAndInjectMethod(maker, returnType, builderType, source, mods, body, name, List.of(paramKey, paramValue));
}