Skip to content

Commit

Permalink
[lombok] IDEA-253486 removed obsolete code
Browse files Browse the repository at this point in the history 
GitOrigin-RevId: 30b1984da1305e1b240be77248464994afbd4102
  • Loading branch information
@mplushnikov @intellij-monorepo-bot
mplushnikov authored and intellij-monorepo-bot committed Nov 11, 2020
1 parent 37327cc commit 3da8305
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 43 deletions.
36 changes: 15 additions & 21 deletions ...s/lombok/src/main/java/de/plushnikov/intellij/plugin/action/delombok/DelombokHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import de.plushnikov.intellij.plugin.processor.AbstractProcessor;
import de.plushnikov.intellij.plugin.processor.LombokProcessorManager;
import de.plushnikov.intellij.plugin.processor.clazz.fieldnameconstants.FieldNameConstantsPredefinedInnerClassFieldProcessor;
import de.plushnikov.intellij.plugin.provider.LombokAugmentorKillSwitch;
import de.plushnikov.intellij.plugin.psi.LombokLightClassBuilder;
import de.plushnikov.intellij.plugin.util.PsiClassUtil;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -75,21 +74,17 @@ private void finish(Project project, PsiFile psiFile) {
UndoUtil.markPsiFileForUndo(psiFile);
}

private Collection<PsiAnnotation> processClass(@NotNull Project project, @NotNull PsiClass psiClass, @NotNull AbstractProcessor lombokProcessor) {
private Collection<PsiAnnotation> processClass(@NotNull Project project,
@NotNull PsiClass psiClass,
@NotNull AbstractProcessor lombokProcessor) {
Collection<PsiAnnotation> psiAnnotations = lombokProcessor.collectProcessedAnnotations(psiClass);

final List<? super PsiElement> psiElements = lombokProcessor.process(psiClass);

try {
LombokAugmentorKillSwitch.deactivateLombokAugmentor();

if (lombokProcessor instanceof FieldNameConstantsPredefinedInnerClassFieldProcessor) {
rebuildElementsBeforeExistingFields(project, psiClass, psiElements);
} else {
rebuildElements(project, psiClass, psiElements);
}
} finally {
LombokAugmentorKillSwitch.activateLombokAugmentor();
if (lombokProcessor instanceof FieldNameConstantsPredefinedInnerClassFieldProcessor) {
rebuildElementsBeforeExistingFields(project, psiClass, psiElements);
} else {
rebuildElements(project, psiClass, psiElements);
}

return psiAnnotations;
Expand Down Expand Up @@ -121,9 +116,9 @@ private void rebuildElementsBeforeExistingFields(Project project, PsiClass psiCl
if (!psiElements.isEmpty()) {
final PsiField existingField = PsiClassUtil.collectClassFieldsIntern(psiClass).stream().findFirst().orElse(null);
Iterator<? super PsiElement> iterator = psiElements.iterator();
PsiElement prev = psiClass.addBefore(rebuildPsiElement(project, (PsiElement) iterator.next()), existingField);
PsiElement prev = psiClass.addBefore(rebuildPsiElement(project, (PsiElement)iterator.next()), existingField);
while (iterator.hasNext()) {
PsiElement curr = rebuildPsiElement(project, (PsiElement) iterator.next());
PsiElement curr = rebuildPsiElement(project, (PsiElement)iterator.next());
if (curr != null) {
prev = psiClass.addAfter(curr, prev);
}
Expand All @@ -133,7 +128,7 @@ private void rebuildElementsBeforeExistingFields(Project project, PsiClass psiCl

private void rebuildElements(Project project, PsiClass psiClass, List<? super PsiElement> psiElements) {
for (Object psiElement : psiElements) {
final PsiElement element = rebuildPsiElement(project, (PsiElement) psiElement);
final PsiElement element = rebuildPsiElement(project, (PsiElement)psiElement);
if (null != element) {
psiClass.add(element);
}
Expand Down Expand Up @@ -193,7 +188,7 @@ private PsiClass rebuildEnum(@NotNull Project project, @NotNull PsiClass fromCla
resultClass.add(rebuildMethod(project, psiMethod));
}

return (PsiClass) CodeStyleManager.getInstance(project).reformat(resultClass);
return (PsiClass)CodeStyleManager.getInstance(project).reformat(resultClass);
}

private PsiClass rebuildClass(@NotNull Project project, @NotNull PsiClass fromClass) {
Expand All @@ -217,7 +212,7 @@ private PsiClass rebuildClass(@NotNull Project project, @NotNull PsiClass fromCl
resultClass.add(rebuildMethod(project, psiMethod));
}

return (PsiClass) CodeStyleManager.getInstance(project).reformat(resultClass);
return (PsiClass)CodeStyleManager.getInstance(project).reformat(resultClass);
}

private PsiMethod rebuildMethod(@NotNull Project project, @NotNull PsiMethod fromMethod) {
Expand Down Expand Up @@ -265,7 +260,7 @@ private PsiMethod rebuildMethod(@NotNull Project project, @NotNull PsiMethod fro
resultMethod.getBody().delete();
}

return (PsiMethod) CodeStyleManager.getInstance(project).reformat(resultMethod);
return (PsiMethod)CodeStyleManager.getInstance(project).reformat(resultMethod);
}

private void copyAnnotations(@NotNull PsiModifierList fromModifierList, @NotNull PsiModifierList toModifierList) {
Expand Down Expand Up @@ -309,7 +304,7 @@ private String getTypeParameterAsString(@NotNull PsiTypeParameter typeParameter)
@NotNull
private String getTypeWithParameter(@NotNull PsiClassType psiClassType) {
if (psiClassType instanceof PsiClassReferenceType) {
return ((PsiClassReferenceType) psiClassType).getReference().getText();
return ((PsiClassReferenceType)psiClassType).getReference().getText();
}
return psiClassType.getName();
}
Expand All @@ -332,7 +327,6 @@ private PsiField rebuildField(@NotNull Project project, @NotNull PsiField fromFi
}
copyModifiers(fromField.getModifierList(), resultField.getModifierList());

return (PsiField) CodeStyleManager.getInstance(project).reformat(resultField);
return (PsiField)CodeStyleManager.getInstance(project).reformat(resultField);
}

}
2 changes: 1 addition & 1 deletion ...ns/lombok/src/main/java/de/plushnikov/intellij/plugin/provider/LombokAugmentProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public <Psi extends PsiElement> List<Psi> getAugments(@NotNull PsiElement elemen
}
// skip processing if disabled, or no lombok library is present
final Project project = element.getProject();
if (!LombokAugmentorKillSwitch.isLombokAugmentorActive() || !LombokProjectValidatorActivity.hasLombokLibrary(project)) {
if (!LombokProjectValidatorActivity.hasLombokLibrary(project)) {
return emptyResult;
}

Expand Down
17 changes: 0 additions & 17 deletions ...ombok/src/main/java/de/plushnikov/intellij/plugin/provider/LombokAugmentorKillSwitch.java
View file

This file was deleted.

4 changes: 2 additions & 2 deletions plugins/lombok/testData/action/delombok/builder/afterBuilderSimple.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ public static class BuilderSimpleBuilder {
BuilderSimpleBuilder() {
}

public BuilderSimple.BuilderSimpleBuilder myInt(int myInt) {
public BuilderSimpleBuilder myInt(int myInt) {
this.myInt = myInt;
return this;
}

public BuilderSimple.BuilderSimpleBuilder myString(String myString) {
public BuilderSimpleBuilder myString(String myString) {
this.myString = myString;
return this;
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/lombok/testData/action/delombok/builder/afterBuilderSimpleWithSetterPrefix.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ public static class BuilderSimpleWithSetterPrefixBuilder {
BuilderSimpleWithSetterPrefixBuilder() {
}

public BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder setMyInt(int myInt) {
public BuilderSimpleWithSetterPrefixBuilder setMyInt(int myInt) {
this.myInt = myInt;
return this;
}

public BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder setMyString(String myString) {
public BuilderSimpleWithSetterPrefixBuilder setMyString(String myString) {
this.myString = myString;
return this;
}
Expand Down

0 comments on commit 3da8305

Please sign in to comment.