Skip to content
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

Jump to bottom

Fix RemoveMappersFix by using SafeDeleteFix #179

Merged
merged 1 commit into from
Mar 16, 2024
Merged

Fix RemoveMappersFix by using SafeDeleteFix #179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 25 additions & 15 deletions src/main/java/org/mapstruct/intellij/inspection/WrongUsageOfMappersFactoryInspection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
package org.mapstruct.intellij.inspection;

import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInsight.daemon.impl.quickfix.RemoveUnusedVariableFix;
import com.intellij.codeInsight.daemon.impl.quickfix.SafeDeleteFix;
import com.intellij.codeInsight.intention.AddAnnotationPsiFix;
import com.intellij.codeInsight.intention.QuickFixFactory;
import com.intellij.codeInspection.IntentionWrapper;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.psi.CommonClassNames;
Expand All @@ -32,6 +31,9 @@
import org.mapstruct.intellij.MapStructBundle;
import org.mapstruct.intellij.util.MapstructUtil;

import java.util.ArrayList;
import java.util.List;

/**
* Inspection that checks that Mappers factory is correctly used
*
Expand Down Expand Up @@ -82,15 +84,20 @@ public void visitMethodCallExpression(PsiMethodCallExpression expression) {
PsiClass mapperClass = (PsiClass) mapperElement;
PsiAnnotation mapperAnnotation = mapperClass.getAnnotation( MapstructUtil.MAPPER_ANNOTATION_FQN );
if ( mapperAnnotation == null ) {
problemsHolder.registerProblem(
expression,
MapStructBundle.message( "inspection.wrong.usage.mappers.factory.non.mapstruct" ),
new AddAnnotationPsiFix(
List<LocalQuickFix> fixes = new ArrayList<>(2);
fixes.add( new AddAnnotationPsiFix(
MapstructUtil.MAPPER_ANNOTATION_FQN,
mapperClass,
PsiNameValuePair.EMPTY_ARRAY
),
createRemoveMappersFix( expression )
) );
LocalQuickFix removeMappersFix = createRemoveMappersFix( expression );
if ( removeMappersFix != null ) {
fixes.add( removeMappersFix );
}
problemsHolder.registerProblem(
expression,
MapStructBundle.message( "inspection.wrong.usage.mappers.factory.non.mapstruct" ),
fixes.toArray( LocalQuickFix[]::new )
);
}
else {
Expand All @@ -105,19 +112,24 @@ public void visitMethodCallExpression(PsiMethodCallExpression expression) {
null :
AnnotationUtil.getStringAttributeValue( memberValue );
if ( componentModel != null && !componentModel.equals( "default" ) ) {
List<LocalQuickFix> fixes = new ArrayList<>(2);
fixes.add( createRemoveComponentModelFix( componentModelAttribute, mapperClass ) );
LocalQuickFix removeMappersFix = createRemoveMappersFix( expression );
if ( removeMappersFix != null ) {
fixes.add( removeMappersFix );
}
problemsHolder.registerProblem(
expression,
MapStructBundle.message( "inspection.wrong.usage.mappers.factory.non.default" ),
createRemoveComponentModelFix( componentModelAttribute, mapperClass ),
createRemoveMappersFix( expression )
fixes.toArray( LocalQuickFix[]::new )
);
}
}
}
}
}

private static class RemoveMappersFix extends RemoveUnusedVariableFix {
private static class RemoveMappersFix extends SafeDeleteFix {

private final String myText;
private final String myFamilyName;
Expand Down Expand Up @@ -145,10 +157,8 @@ public String getFamilyName() {
private static LocalQuickFix createRemoveMappersFix(@NotNull PsiMethodCallExpression methodCallExpression) {
PsiElement parent = methodCallExpression.getParent();
if ( parent instanceof PsiVariable ) {
return IntentionWrapper.wrapToQuickFix(
new RemoveMappersFix( (PsiVariable) parent ),
methodCallExpression.getContainingFile()
);

return new RemoveMappersFix( (PsiVariable) parent );
}

return null;
Expand Down
Loading