Skip to content

Optimizations #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 7, 2024
Merged

Optimizations #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
293167e
Remove document commit
junkfactory Aug 6, 2024
70c3baa
Invoke post document processing
junkfactory Aug 6, 2024
bec47c0
Use string in user data
junkfactory Aug 6, 2024
35c6dfb
Use createField/MethodFromText and StringBuilder
junkfactory Aug 7, 2024
b08cc3d
Short circuit field collections
junkfactory Aug 7, 2024
eaad57d
Use StringBuilder in inner class builder
junkfactory Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 35 additions & 31 deletions src/main/java/com/github/junkfactory/innerbuilder/JavaInnerBuilderHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.github.junkfactory.innerbuilder;

import com.github.junkfactory.innerbuilder.generators.FieldCollector;
import com.github.junkfactory.innerbuilder.generators.GeneratorFactory;
import com.github.junkfactory.innerbuilder.generators.GeneratorParams;
import com.github.junkfactory.innerbuilder.generators.PsiParams;
Expand All @@ -13,15 +14,14 @@
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.project.Project;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiJavaFile;
import com.intellij.util.AstLoadingFilter;
import org.jetbrains.annotations.NotNull;

import java.util.EnumSet;
import java.util.Set;

import static com.github.junkfactory.innerbuilder.generators.FieldCollector.collectFields;
import static com.github.junkfactory.innerbuilder.ui.JavaInnerBuilderOptionSelector.selectFieldsAndOptions;

class JavaInnerBuilderHandler implements LanguageCodeInsightActionHandler {
Expand All @@ -48,19 +48,15 @@ public boolean startInWriteAction() {
}

private static boolean isApplicable(final PsiFile file, final Editor editor) {
var targetElements = collectFields(file, editor);
return !targetElements.isEmpty();
return FieldCollector.builder()
.file(file)
.editor(editor)
.build()
.hasFields();
}

@Override
public void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile file) {
var psiDocumentManager = PsiDocumentManager.getInstance(project);
var currentDocument = psiDocumentManager.getDocument(file);
if (currentDocument == null) {
return;
}

psiDocumentManager.commitDocument(currentDocument);

if (!EditorModificationUtil.checkModificationAllowed(editor)) {
return;
Expand All @@ -70,29 +66,37 @@ public void invoke(@NotNull final Project project, @NotNull final Editor editor,
return;
}

var existingFields = collectFields(file, editor);
if (existingFields.isEmpty()) {
return;
}

var selectedFields = selectFieldsAndOptions(existingFields, project);
if (selectedFields.isEmpty()) {
return;
}

var psiParams = PsiParams.builder()
var fieldCollector = FieldCollector.builder()
.file(file)
.selectedFields(selectedFields)
.factory(JavaPsiFacade.getElementFactory(project))
.build();
var generatorParams = GeneratorParams.builder()
.project(project)
.editor(editor)
.psi(psiParams)
.options(currentOptions())
.build();
var builderGenerator = generatorFactory.createInnerBuilderGenerator(generatorParams);
ApplicationManager.getApplication().runWriteAction(builderGenerator);

AstLoadingFilter.disallowTreeLoading(() -> {
var existingFields = fieldCollector.collectFields();
if (existingFields.isEmpty()) {
return;
}

var selectedFields = selectFieldsAndOptions(existingFields, project);
if (selectedFields.isEmpty()) {
return;
}

var psiParams = PsiParams.builder()
.file(file)
.selectedFields(selectedFields)
.factory(JavaPsiFacade.getElementFactory(project))
.build();
var generatorParams = GeneratorParams.builder()
.project(project)
.editor(editor)
.psi(psiParams)
.options(currentOptions())
.build();
var builderGenerator = generatorFactory.createInnerBuilderGenerator(generatorParams);
ApplicationManager.getApplication().runWriteAction(builderGenerator);
});

}

private Set<JavaInnerBuilderOption> currentOptions() {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/github/junkfactory/innerbuilder/generators/AbstractGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ abstract class AbstractGenerator implements Runnable {
static final String BUILDER_METHOD_NAME = "builder";
@NonNls
static final String TO_BUILDER_NAME = "toBuilder";
@NonNls
static final String EMPTY = "";
@NonNls
static final String SPACE = " ";

protected final GeneratorFactory generatorFactory;
protected final GeneratorParams generatorParams;
Expand Down
11 changes: 7 additions & 4 deletions src/main/java/com/github/junkfactory/innerbuilder/generators/BuilderFieldsGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import java.util.LinkedList;
import java.util.List;
import java.util.Optional;

class BuilderFieldsGenerator extends AbstractGenerator implements FieldsGenerator {

Expand Down Expand Up @@ -68,9 +67,13 @@ private void deleteFieldAndMethodIfExists(PsiClass builderClass, PsiField field)
if (null == field) {
return;
}
Optional.ofNullable(field.getCopyableUserData(UserDataKey.METHOD_REF))
.map(m -> builderClass.findMethodBySignature(m, false))
.ifPresent(PsiElement::delete);
var methodName = field.getCopyableUserData(UserDataKey.METHOD_REF);
if (null != methodName) {
var builderClassMethods = builderClass.findMethodsByName(methodName, false);
for (var method : builderClassMethods) {
method.delete();
}
}
field.delete();
}

Expand Down
85 changes: 35 additions & 50 deletions src/main/java/com/github/junkfactory/innerbuilder/generators/BuilderMethodsGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@
import com.intellij.psi.PsiField;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiModifier;
import com.intellij.psi.PsiStatement;
import com.intellij.psi.util.PsiUtil;

import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;

class BuilderMethodsGenerator extends AbstractGenerator implements MethodsGenerator {

Expand All @@ -35,7 +33,7 @@ public void run() {
PsiElement lastAddedElement = null;
for (var field : fieldsGenerator.getFields()) {
var setterMethod = generateFieldMethod(field);
field.putCopyableUserData(UserDataKey.METHOD_REF, setterMethod);
field.putCopyableUserData(UserDataKey.METHOD_REF, setterMethod.getName());
lastAddedElement = addMethod(builderClass, lastAddedElement, setterMethod, false);
}

Expand Down Expand Up @@ -86,74 +84,61 @@ private PsiMethod generateAddToCollection(PsiField field, PsiMethod fieldAddMeth
.substitute(param.getType());

//now build the add method
var fieldName = "addTo" + StringUtil.capitalize(field.getName());
var methodName = "addTo" + StringUtil.capitalize(field.getName());
var methodText = """
public %s %s(%s %s) {
this.%s.add(%s);
return this;
}""".formatted(BUILDER_CLASS_NAME, methodName, paramType.getPresentableText(),
param.getName().toLowerCase(), field.getName(), param.getName());
var psiElementFactory = generatorParams.psi().factory();
var addMethod = psiElementFactory.createMethod(fieldName, builderClassParams.builderType());
PsiUtil.setModifierProperty(addMethod, PsiModifier.PUBLIC, true);

var addParameter = psiElementFactory.createParameter(param.getName().toLowerCase(), paramType);
addMethod.getParameterList().add(addParameter);

var addMethodBody = Objects.requireNonNull(addMethod.getBody());
var addBody = psiElementFactory.createStatementFromText(String.format(
"this.%s.add(%s);", field.getName(), param.getName()), addMethod);
addMethodBody.add(addBody);
addMethodBody.add(Utils.createReturnThis(psiElementFactory, addMethod));
return addMethod;
return psiElementFactory.createMethodFromText(methodText, field);
}

private PsiMethod generateBuilderSetter(PsiField field) {
var fieldType = field.getType();
var fieldName = Utils.hasOneLetterPrefix(field.getName()) ?
Character.toLowerCase(field.getName().charAt(1)) + field.getName().substring(2) : field.getName();

var methodText = """
public %s %s(%s %s) {
this.%s = %s;
return this;
}""".formatted(BUILDER_CLASS_NAME, fieldName, fieldType.getPresentableText(),
fieldName, field.getName(), fieldName);
var psiElementFactory = generatorParams.psi().factory();
var setterMethod = psiElementFactory.createMethod(fieldName, builderClassParams.builderType());
setterMethod.getModifierList().setModifierProperty(PsiModifier.PUBLIC, true);

var setterParameter = psiElementFactory.createParameter(fieldName, fieldType);
setterMethod.getParameterList().add(setterParameter);

var setterMethodBody = Objects.requireNonNull(setterMethod.getBody());
var actualFieldName = "this." + fieldName;
var assignStatement = psiElementFactory.createStatementFromText(String.format(
"%s = %s;", actualFieldName, fieldName), setterMethod);
setterMethodBody.add(assignStatement);
setterMethodBody.add(Utils.createReturnThis(psiElementFactory, setterMethod));
return setterMethod;
return psiElementFactory.createMethodFromText(methodText, field);
}

private PsiMethod generateBuildMethod() {
var targetClass = builderClassParams.targetClass();
var psiElementFactory = generatorParams.psi().factory();
var targetClassType = psiElementFactory.createType(targetClass);
var buildMethod = psiElementFactory.createMethod("build", targetClassType);

var targetModifierList = Objects.requireNonNull(targetClass.getModifierList());
Stream.of(PsiModifier.PUBLIC, PsiModifier.PACKAGE_LOCAL)
.filter(targetModifierList::hasModifierProperty)
.findFirst()
.ifPresent(modifier -> PsiUtil.setModifierProperty(buildMethod, modifier, true));
boolean isPublic = targetModifierList.hasModifierProperty(PsiModifier.PUBLIC);

var buildMethodBody = Objects.requireNonNull(buildMethod.getBody());
var buildMethod = new StringBuilder()
.append(isPublic ? PsiModifier.PUBLIC : EMPTY)
.append(isPublic ? SPACE : EMPTY)
.append(targetClass.getName())
.append(" build() {");
if (generatorParams.options().contains(JavaInnerBuilderOption.WITH_VALIDATE_METHOD)) {
var validateCall = psiElementFactory.createStatementFromText("validate();", buildMethod);
buildMethodBody.add(validateCall);
buildMethod.append("validate();");
}

final PsiStatement returnStatement;
if (targetClass.isRecord()) {
var recordParameters = generatorParams.psi().selectedFields().stream()
.map(m -> m.getElement().getName())
var recordParameters = fieldsGenerator.getFields().stream()
.map(PsiField::getName)
.collect(Collectors.joining(", "));
returnStatement = psiElementFactory.createStatementFromText(String.format(
"return new %s(%s);", targetClass.getName(), recordParameters), buildMethod);
buildMethod.append("return new ")
.append(targetClass.getName())
.append("(")
.append(recordParameters)
.append(");");
} else {
returnStatement = psiElementFactory.createStatementFromText(String.format(
"return new %s(this);", targetClass.getName()), buildMethod);
buildMethod.append("return new ")
.append(targetClass.getName())
.append("(this);");
}
buildMethod.append("}");

buildMethodBody.add(returnStatement);
return buildMethod;
return generatorParams.psi().factory().createMethodFromText(buildMethod.toString(), targetClass);
}
}
Loading