fix for very strange method names

Author: h908714124

core/src/main/java/net/jbock/compiler/PositionalParamFactory.java

@@ -56,7 +56,7 @@ private Either<String, ConvertedParameter<PositionalParameter>> checkOnlyOnePosi
     }
     return Either.ofLeft(alreadyCreated.stream()
         .filter(ConvertedParameter::isRepeatable)
-        .map(p -> "positional parameter " + p.enumName().enumConstant() + " is also repeatable")
+        .map(p -> "positional parameter " + p.parameter().paramLabel() + " is also repeatable")
         .findAny())
         .orRight(c);
   }
@@ -88,11 +88,11 @@ private Either<String, ConvertedParameter<PositionalParameter>> checkRankConsist
       }
       if (thisOrder > otherOrder && thisPosition < other.parameter().position()) {
         return left("position must be greater than position of " +
-            other.skew() + " parameter " + other.enumName());
+            other.skew() + " parameter " + other.parameter().paramLabel());
       }
       if (thisOrder < otherOrder && thisPosition > other.parameter().position()) {
         return left("position must be less than position of " +
-            other.skew() + " parameter " + other.enumName());
+            other.skew() + " parameter " + other.parameter().paramLabel());
       }
     }
     return right(c);

core/src/main/java/net/jbock/compiler/view/Impl.java

@@ -40,7 +40,7 @@ TypeSpec define() {
     TypeSpec.Builder spec = TypeSpec.classBuilder(generatedTypes.implType())
         .superclass(sourceElement.typeName());
     for (ConvertedParameter<? extends AbstractParameter> c : context.parameters()) {
-      spec.addField(FieldSpec.builder(c.parameter().returnType(), c.enumConstant()).build());
+      spec.addField(implField(c));
     }
     return spec.addModifiers(PRIVATE, STATIC)
         .addMethod(implConstructor())
@@ -55,18 +55,23 @@ private MethodSpec parameterMethodOverride(ConvertedParameter<? extends Abstract
     return MethodSpec.methodBuilder(param.methodName())
         .returns(param.returnType())
         .addModifiers(param.getAccessModifiers())
-        .addStatement("return $N", FieldSpec.builder(param.returnType(), c.enumConstant()).build())
+        .addStatement("return $N", implField(c))
         .build();
   }
 
   private MethodSpec implConstructor() {
     MethodSpec.Builder spec = MethodSpec.constructorBuilder();
     for (ConvertedParameter<? extends AbstractParameter> c : context.parameters()) {
-      TypeName returnType = c.parameter().returnType();
-      String name = c.enumConstant();
-      spec.addStatement("this.$N = $L", FieldSpec.builder(returnType, name).build(), c.extractExpr());
+      FieldSpec field = implField(c);
+      spec.addStatement("this.$N = $L", field, c.extractExpr());
       spec.addParameter(c.constructorParam());
     }
     return spec.build();
   }
+
+  private FieldSpec implField(ConvertedParameter<? extends AbstractParameter> c) {
+    TypeName fieldType = c.parameter().returnType();
+    String fieldName = c.enumConstant();
+    return FieldSpec.builder(fieldType, fieldName).build();
+  }
 }

core/src/main/java/net/jbock/compiler/view/PrintOnlineHelpMethod.java

@@ -35,6 +35,7 @@ public class PrintOnlineHelpMethod extends Cached<MethodSpec> {
   private final PrintTokensMethod printTokensMethod;
   private final CommonFields commonFields;
   private final Elements elements;
+  private final PrintOptionMethod printOptionMethod;
 
   @Inject
   PrintOnlineHelpMethod(
@@ -44,14 +45,16 @@ public class PrintOnlineHelpMethod extends Cached<MethodSpec> {
       NamedOptions namedOptions,
       PrintTokensMethod printTokensMethod,
       CommonFields commonFields,
-      Elements elements) {
+      Elements elements,
+      PrintOptionMethod printOptionMethod) {
     this.sourceElement = sourceElement;
     this.allParameters = allParameters;
     this.positionalParameters = positionalParameters;
     this.namedOptions = namedOptions;
     this.printTokensMethod = printTokensMethod;
     this.commonFields = commonFields;
     this.elements = elements;
+    this.printOptionMethod = printOptionMethod;
   }
 
   @Override
@@ -119,27 +122,33 @@ MethodSpec define() {
   }
 
   private CodeBlock printNamedOptionCode(String optionsFormat, ConvertedParameter<NamedOption> c) {
+    String enumConstant = c.enumConstant();
     if (allParameters.anyDescriptionKeys()) {
-      return CodeBlock.builder().addStatement("printOption($T.$L, $S, $S)",
-          sourceElement.optionType(), c.enumConstant(),
+      return CodeBlock.builder().addStatement("$N($T.$L, $S, $S)",
+          printOptionMethod.get(),
+          sourceElement.optionType(), enumConstant,
           String.format(optionsFormat, c.parameter().namesWithLabel(c.isFlag())),
           c.parameter().descriptionKey().orElse("")).build();
     } else {
-      return CodeBlock.builder().addStatement("printOption($T.$L, $S)",
-          sourceElement.optionType(), c.enumConstant(),
+      return CodeBlock.builder().addStatement("$N($T.$L, $S)",
+          printOptionMethod.get(),
+          sourceElement.optionType(), enumConstant,
           String.format(optionsFormat, c.parameter().namesWithLabel(c.isFlag()))).build();
     }
   }
 
   private CodeBlock printPositionalCode(String paramsFormat, ConvertedParameter<PositionalParameter> p) {
+    String enumConstant = p.enumConstant();
     if (allParameters.anyDescriptionKeys()) {
-      return CodeBlock.builder().addStatement("printOption($T.$L, $S, $S)",
-          sourceElement.optionType(), p.enumConstant(),
+      return CodeBlock.builder().addStatement("$N($T.$L, $S, $S)",
+          printOptionMethod.get(),
+          sourceElement.optionType(), enumConstant,
           String.format(paramsFormat, p.parameter().paramLabel()),
           p.parameter().descriptionKey().orElse("")).build();
     } else {
-      return CodeBlock.builder().addStatement("printOption($T.$L, $S)",
-          sourceElement.optionType(), p.enumConstant(),
+      return CodeBlock.builder().addStatement("$N($T.$L, $S)",
+          printOptionMethod.get(),
+          sourceElement.optionType(), enumConstant,
           String.format(paramsFormat, p.parameter().paramLabel())).build();
     }
   }

core/src/main/java/net/jbock/compiler/view/StatefulParser.java

@@ -82,14 +82,15 @@ TypeSpec define() {
   private MethodSpec privateConstructor() {
     CodeBlock.Builder code = CodeBlock.builder();
     for (ConvertedParameter<NamedOption> namedOption : namedOptions.options()) {
+      String enumConstant = namedOption.enumConstant();
       for (String dashedName : namedOption.parameter().names()) {
-        code.addStatement("$N.put($S, $T.$L)", commonFields.optionNames(), dashedName, sourceElement.optionType(),
-            namedOption.enumConstant());
+        code.addStatement("$N.put($S, $T.$L)",
+            commonFields.optionNames(), dashedName, sourceElement.optionType(),
+            enumConstant);
       }
-      String enumConstant = namedOption.enumConstant();
-      code.addStatement("$N.put($T.$L, new $T($T.$L))",
-          commonFields.optionParsers(), sourceElement.optionType(), enumConstant, optionParserType(namedOption),
-          sourceElement.optionType(), enumConstant);
+      code.addStatement("$1N.put($2T.$3L, new $4T($2T.$3L))",
+          commonFields.optionParsers(), sourceElement.optionType(),
+          enumConstant, optionParserType(namedOption));
     }
     return MethodSpec.constructorBuilder()
         .addCode(code.build())

core/src/test/java/net/jbock/compiler/ProcessorTest.java

@@ -377,7 +377,7 @@ void fancyOptionNames() {
         "  abstract boolean fancy();",
         "}");
     assertAbout(javaSources()).that(singletonList(javaFile))
-        .processedWith(new Processor(true))
+        .processedWith(new Processor())
         .compilesWithoutError();
   }