Fix positions and refactor to separate files

Author: junkfactory

src/main/java/com/github/junkfactory/innerbuilder/generators/AbstractGenerator.java

@@ -66,6 +66,11 @@ protected boolean addImport(PsiType psiType) {
         return generatorParams.psi().codeStyleManager().addImport((PsiJavaFile) generatorParams.psi().file(), psiClass);
     }
 
+    protected PsiMethod findFirstConstructor(PsiClass target) {
+        var constructors = target.getConstructors();
+        return constructors.length > 0 ? constructors[0] : null;
+    }
+
     private PsiMethod findConstructor(PsiClass target, PsiMethod newMethod) {
         for (var constructor : target.getConstructors()) {
             if (Utils.areParameterListsEqual(constructor.getParameterList(), newMethod.getParameterList())) {

src/main/java/com/github/junkfactory/innerbuilder/generators/BuilderClass.java

@@ -0,0 +1,11 @@
+package com.github.junkfactory.innerbuilder.generators;
+
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiType;
+
+public record BuilderClass(PsiClass psiClass,
+                           PsiType builderType,
+                           BuilderClassName builderClassName,
+                           boolean genericType) {
+}
+

src/main/java/com/github/junkfactory/innerbuilder/generators/BuilderClassName.java

@@ -0,0 +1,5 @@
+package com.github.junkfactory.innerbuilder.generators;
+
+public record BuilderClassName(String className, String instanceClassName) {
+}
+

src/main/java/com/github/junkfactory/innerbuilder/generators/BuilderClassParams.java

@@ -1,6 +1,5 @@
 package com.github.junkfactory.innerbuilder.generators;
 
-import com.github.junkfactory.innerbuilder.generators.InnerBuilderGenerator.BuilderClass;
 import com.intellij.psi.PsiClass;
 
 public record BuilderClassParams(PsiClass targetClass,

src/main/java/com/github/junkfactory/innerbuilder/generators/BuilderMethodsGenerator.java

@@ -14,9 +14,6 @@
 
 class BuilderMethodsGenerator extends AbstractGenerator implements MethodsGenerator {
 
-    public record BuilderClassName(String className, String instanceClassName) {
-    }
-
     private final BuilderClassParams builderClassParams;
     private final FieldsGenerator fieldsGenerator;
 
@@ -37,7 +34,7 @@ public GenerationResult generate() {
         var targetClass = builderClassParams.targetClass();
         var targetModifierList = Objects.requireNonNull(targetClass.getModifierList());
         isPublic = targetModifierList.hasModifierProperty(PsiModifier.PUBLIC);
-        PsiElement lastAddedElement = null;
+        PsiElement lastAddedElement = findFirstConstructor(builderClass.psiClass());
         for (var field : fieldsGenerator.getFields()) {
             var setterMethod = generateFieldMethod(field);
             field.putCopyableUserData(UserDataKey.METHOD_REF, setterMethod.getName());
@@ -47,11 +44,11 @@ public GenerationResult generate() {
         var options = generatorParams.options();
         if (options.contains(JavaInnerBuilderOption.WITH_VALIDATE_METHOD)) {
             var validateMethod = generateValidateMethod();
-            addMethod(builderClass.psiClass(), lastAddedElement, validateMethod, false);
+            lastAddedElement = addMethod(builderClass.psiClass(), lastAddedElement, validateMethod, false);
         }
 
         var buildMethod = generateBuildMethod(targetClass);
-        addMethod(builderClass.psiClass(), null, buildMethod, builderClassParams.targetClass().isRecord());
+        addMethod(builderClass.psiClass(), lastAddedElement, buildMethod, builderClassParams.targetClass().isRecord());
         return generationResult;
     }
 

src/main/java/com/github/junkfactory/innerbuilder/generators/InnerBuilderGenerator.java

@@ -1,14 +1,12 @@
 package com.github.junkfactory.innerbuilder.generators;
 
-import com.github.junkfactory.innerbuilder.generators.BuilderMethodsGenerator.BuilderClassName;
 import com.github.junkfactory.innerbuilder.ui.JavaInnerBuilderOption;
 import com.intellij.codeInsight.generation.PsiFieldMember;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiField;
 import com.intellij.psi.PsiJavaFile;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiModifier;
-import com.intellij.psi.PsiType;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.util.PropertyUtilBase;
 import com.intellij.psi.util.PsiUtil;
@@ -23,12 +21,6 @@
 
 class InnerBuilderGenerator extends AbstractGenerator implements Generator {
 
-    public record BuilderClass(PsiClass psiClass,
-                               PsiType builderType,
-                               BuilderClassName builderClassName,
-                               boolean genericType) {
-    }
-
     InnerBuilderGenerator(GeneratorFactory generatorFactory, GeneratorParams generatorParams) {
         super(generatorFactory, generatorParams);
     }
@@ -103,7 +95,7 @@ private PsiMethod generateToBuilderMethod(PsiClass targetClass,
 
     private PsiMethod generateStaticBuilderMethod(PsiClass targetClass, BuilderClass builderClass) {
         var psiElementFactory = generatorParams.psi().factory();
-        var methodName = Utils.buildBuilderMethodName(builderClass.builderType());
+        var methodName = Utils.buildBuilderMethodName(builderClass);
         var newBuilderMethod = psiElementFactory.createMethodFromText(methodName, targetClass);
         PsiUtil.setModifierProperty(newBuilderMethod, PsiModifier.STATIC, true);
         PsiUtil.setModifierProperty(newBuilderMethod, PsiModifier.PUBLIC, true);

src/main/java/com/github/junkfactory/innerbuilder/generators/Utils.java

@@ -1,6 +1,5 @@
 package com.github.junkfactory.innerbuilder.generators;
 
-import com.github.junkfactory.innerbuilder.generators.BuilderMethodsGenerator.BuilderClassName;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiClassType;
@@ -21,7 +20,7 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 
-import static com.github.junkfactory.innerbuilder.generators.AbstractGenerator.BUILDER_CLASS_NAME;
+import static com.github.junkfactory.innerbuilder.generators.AbstractGenerator.BUILDER_METHOD_NAME;
 
 public class Utils {
     @NonNls
@@ -178,25 +177,22 @@ public static BuilderClassName buildClassName(String className, PsiClass targetC
         return new BuilderClassName(builderClassName.toString(), className);
     }
 
-    public static String buildBuilderMethodName(PsiType builderType) {
-        var methodName = BUILDER_CLASS_NAME;
-        if (isGenericType(builderType)) {
-            var psiClassType = (PsiClassType) builderType;
+    public static String buildBuilderMethodName(BuilderClass builderClass) {
+        var psiClassType = (PsiClassType) builderClass.builderType();
+        if (builderClass.genericType()) {
             var typeParameters = psiClassType.getParameters();
-            if (typeParameters.length > 0) {
-                var typeParameterNames = new StringBuilder();
-                for (int i = 0, l = typeParameters.length; i < l; i++) {
-                    var typeParameter = typeParameters[i];
-                    typeParameterNames.append(typeParameter.getPresentableText());
-                    if (i < l - 1) {
-                        typeParameterNames.append(", ");
-                    }
+            var typeParameterNames = new StringBuilder();
+            for (int i = 0, l = typeParameters.length; i < l; i++) {
+                var typeParameter = typeParameters[i];
+                typeParameterNames.append(typeParameter.getPresentableText());
+                if (i < l - 1) {
+                    typeParameterNames.append(", ");
                 }
-                methodName = String.format("<%s> %s %s(){}", typeParameterNames,
-                        builderType.getPresentableText(), methodName);
             }
+            return String.format("<%s> %s %s(){}", typeParameterNames,
+                    psiClassType.getPresentableText(), BUILDER_METHOD_NAME);
         }
-        return methodName;
+        return String.format("%s %s(){}", psiClassType.getPresentableText(), BUILDER_METHOD_NAME);
     }
 
 }