Skip to content

Localizing inline inspections/refactorings #237

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
VISTALL merged 2 commits into from
Nov 15, 2025
Merged

Localizing inline inspections/refactorings #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
955ab2e
Localizing inline inspections/refactorings.
unv-unv Nov 13, 2025
65644ba
Localizing inline inspections/refactorings (part 2).
unv-unv Nov 14, 2025
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
45 changes: 23 additions & 22 deletions plugin/src/main/java/com/intellij/java/impl/ig/fixes/InlineCallFix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import com.intellij.java.language.psi.PsiReferenceExpression;
import com.siyeh.ig.InspectionGadgetsFix;
import com.siyeh.localize.InspectionGadgetsLocalize;
import consulo.annotation.access.RequiredReadAction;
import consulo.annotation.access.RequiredWriteAction;
import consulo.application.Application;
import consulo.language.editor.inspection.ProblemDescriptor;
import consulo.language.editor.refactoring.action.RefactoringActionHandler;
Expand All @@ -30,27 +30,28 @@
import jakarta.annotation.Nonnull;

public class InlineCallFix extends InspectionGadgetsFix {

@Nonnull
public LocalizeValue getName() {
return InspectionGadgetsLocalize.inlineCallQuickfix();
}

@RequiredReadAction
public void doFix(final Project project, ProblemDescriptor descriptor) {
final PsiElement nameElement = descriptor.getPsiElement();
final PsiReferenceExpression methodExpression = (PsiReferenceExpression)nameElement.getParent();
assert methodExpression != null;
final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)methodExpression.getParent();
final JavaRefactoringActionHandlerFactory factory = JavaRefactoringActionHandlerFactory.getInstance();
final RefactoringActionHandler inlineHandler = factory.createInlineHandler();
final Runnable runnable = () -> inlineHandler.invoke(project, new PsiElement[]{methodCallExpression}, null);
final Application application = project.getApplication();
if (application.isUnitTestMode()) {
runnable.run();
@Nonnull
@Override
public LocalizeValue getName() {
return InspectionGadgetsLocalize.inlineCallQuickfix();
}
else {
application.invokeLater(runnable, project.getDisposed());

@Override
@RequiredWriteAction
public void doFix(Project project, ProblemDescriptor descriptor) {
PsiElement nameElement = descriptor.getPsiElement();
PsiReferenceExpression methodExpression = (PsiReferenceExpression) nameElement.getParent();
assert methodExpression != null;
PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression) methodExpression.getParent();
JavaRefactoringActionHandlerFactory factory = JavaRefactoringActionHandlerFactory.getInstance();
RefactoringActionHandler inlineHandler = factory.createInlineHandler();
Runnable runnable = () -> inlineHandler.invoke(project, new PsiElement[]{methodCallExpression}, null);
Application application = project.getApplication();
if (application.isUnitTestMode()) {
runnable.run();
}
else {
application.invokeLater(runnable, project.getDisposed());
}
}
}
}
269 changes: 131 additions & 138 deletions .../main/java/com/intellij/java/impl/ig/performance/CallToSimpleGetterInClassInspection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.siyeh.ig.InspectionGadgetsFix;
import com.siyeh.ig.psiutils.ClassUtils;
import com.siyeh.localize.InspectionGadgetsLocalize;
import consulo.annotation.access.RequiredWriteAction;
import consulo.annotation.component.ExtensionImpl;
import consulo.application.util.query.Query;
import consulo.deadCodeNotWorking.impl.MultipleCheckboxOptionsPanel;
Expand All @@ -38,157 +39,149 @@

@ExtensionImpl
public class CallToSimpleGetterInClassInspection extends BaseInspection {
@SuppressWarnings("UnusedDeclaration")
public boolean ignoreGetterCallsOnOtherObjects = false;

@SuppressWarnings("UnusedDeclaration")
public boolean ignoreGetterCallsOnOtherObjects = false;
@SuppressWarnings("UnusedDeclaration")
public boolean onlyReportPrivateGetter = false;

@SuppressWarnings("UnusedDeclaration")
public boolean onlyReportPrivateGetter = false;

@Override
@Nonnull
public String getID() {
return "CallToSimpleGetterFromWithinClass";
}

@Override
@Nonnull
public LocalizeValue getDisplayName() {
return InspectionGadgetsLocalize.callToSimpleGetterInClassDisplayName();
}

@Override
@Nonnull
public String buildErrorString(Object... infos) {
return InspectionGadgetsLocalize.callToSimpleGetterInClassProblemDescriptor().get();
}

@Override
@Nullable
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel optionsPanel = new MultipleCheckboxOptionsPanel(this);
optionsPanel.addCheckbox(
InspectionGadgetsLocalize.callToSimpleGetterInClassIgnoreOption().get(),
"ignoreGetterCallsOnOtherObjects"
);
optionsPanel.addCheckbox(InspectionGadgetsLocalize.callToPrivateSimpleGetterInClassOption().get(), "onlyReportPrivateGetter");
return optionsPanel;
}

@Override
public InspectionGadgetsFix buildFix(Object... infos) {
return new InlineCallFix();
}
@Override
@Nonnull
public String getID() {
return "CallToSimpleGetterFromWithinClass";
}

private static class InlineCallFix extends InspectionGadgetsFix {
@Override
@Nonnull
public LocalizeValue getName() {
return InspectionGadgetsLocalize.callToSimpleGetterInClassInlineQuickfix();
public LocalizeValue getDisplayName() {
return InspectionGadgetsLocalize.callToSimpleGetterInClassDisplayName();
}

@Override
public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
final PsiElement methodIdentifier = descriptor.getPsiElement();
final PsiReferenceExpression methodExpression = (PsiReferenceExpression)methodIdentifier.getParent();
if (methodExpression == null) {
return;
}
final PsiMethodCallExpression call = (PsiMethodCallExpression)methodExpression.getParent();
if (call == null) {
return;
}
final PsiMethod method = call.resolveMethod();
if (method == null) {
return;
}
final PsiCodeBlock body = method.getBody();
if (body == null) {
return;
}
final PsiStatement[] statements = body.getStatements();
final PsiReturnStatement returnStatement = (PsiReturnStatement)statements[0];
final PsiExpression returnValue = returnStatement.getReturnValue();
if (!(returnValue instanceof PsiReferenceExpression)) {
return;
}
final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)returnValue;
final PsiField field = (PsiField)referenceExpression.resolve();
if (field == null) {
return;
}
final String fieldName = field.getName();
if (fieldName == null) {
return;
}
final PsiExpression qualifier = methodExpression.getQualifierExpression();
if (qualifier == null) {
final JavaPsiFacade facade = JavaPsiFacade.getInstance(call.getProject());
final PsiResolveHelper resolveHelper = facade.getResolveHelper();
final PsiVariable variable = resolveHelper.resolveReferencedVariable(fieldName, call);
if (variable == null) {
return;
}
if (variable.equals(field)) {
replaceExpression(call, fieldName);
}
else {
replaceExpression(call, "this." + fieldName);
}
}
else {
replaceExpression(call, qualifier.getText() + '.' + fieldName);
}
@Nonnull
public String buildErrorString(Object... infos) {
return InspectionGadgetsLocalize.callToSimpleGetterInClassProblemDescriptor().get();
}
}

@Override
public BaseInspectionVisitor buildVisitor() {
return new CallToSimpleGetterInClassVisitor();
}
@Override
@Nullable
public JComponent createOptionsPanel() {
MultipleCheckboxOptionsPanel optionsPanel = new MultipleCheckboxOptionsPanel(this);
optionsPanel.addCheckbox(
InspectionGadgetsLocalize.callToSimpleGetterInClassIgnoreOption().get(),
"ignoreGetterCallsOnOtherObjects"
);
optionsPanel.addCheckbox(InspectionGadgetsLocalize.callToPrivateSimpleGetterInClassOption().get(), "onlyReportPrivateGetter");
return optionsPanel;
}

private class CallToSimpleGetterInClassVisitor extends BaseInspectionVisitor {
@Override
public void visitMethodCallExpression(@Nonnull PsiMethodCallExpression call) {
super.visitMethodCallExpression(call);
final PsiClass containingClass = ClassUtils.getContainingClass(call);
if (containingClass == null) {
return;
}
final PsiMethod method = call.resolveMethod();
if (method == null) {
return;
}
if (!containingClass.equals(method.getContainingClass())) {
return;
}
final PsiReferenceExpression methodExpression = call.getMethodExpression();
final PsiExpression qualifier = methodExpression.getQualifierExpression();
if (qualifier != null && !(qualifier instanceof PsiThisExpression)) {
if (ignoreGetterCallsOnOtherObjects) {
return;
public InspectionGadgetsFix buildFix(Object... infos) {
return new InlineCallFix();
}

private static class InlineCallFix extends InspectionGadgetsFix {
@Nonnull
@Override
public LocalizeValue getName() {
return InspectionGadgetsLocalize.callToSimpleGetterInClassInlineQuickfix();
}
final PsiType type = qualifier.getType();
if (!(type instanceof PsiClassType)) {
return;

@Override
@RequiredWriteAction
public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
PsiElement methodIdentifier = descriptor.getPsiElement();
PsiReferenceExpression methodExpression = (PsiReferenceExpression) methodIdentifier.getParent();
if (methodExpression == null) {
return;
}
PsiMethodCallExpression call = (PsiMethodCallExpression) methodExpression.getParent();
if (call == null) {
return;
}
PsiMethod method = call.resolveMethod();
if (method == null) {
return;
}
PsiCodeBlock body = method.getBody();
if (body == null) {
return;
}
PsiStatement[] statements = body.getStatements();
PsiReturnStatement returnStatement = (PsiReturnStatement) statements[0];
if (!(returnStatement.getReturnValue() instanceof PsiReferenceExpression refExpr
&& refExpr.resolve() instanceof PsiField field)) {
return;
}
String fieldName = field.getName();
if (fieldName == null) {
return;
}
PsiExpression qualifier = methodExpression.getQualifierExpression();
if (qualifier == null) {
JavaPsiFacade facade = JavaPsiFacade.getInstance(call.getProject());
PsiResolveHelper resolveHelper = facade.getResolveHelper();
PsiVariable variable = resolveHelper.resolveReferencedVariable(fieldName, call);
if (variable == null) {
return;
}
if (variable.equals(field)) {
replaceExpression(call, fieldName);
}
else {
replaceExpression(call, "this." + fieldName);
}
}
else {
replaceExpression(call, qualifier.getText() + '.' + fieldName);
}
}
final PsiClassType classType = (PsiClassType)type;
final PsiClass qualifierClass = classType.resolve();
if (!containingClass.equals(qualifierClass)) {
return;
}

@Override
public BaseInspectionVisitor buildVisitor() {
return new CallToSimpleGetterInClassVisitor();
}

private class CallToSimpleGetterInClassVisitor extends BaseInspectionVisitor {
@Override
public void visitMethodCallExpression(@Nonnull PsiMethodCallExpression call) {
super.visitMethodCallExpression(call);
PsiClass containingClass = ClassUtils.getContainingClass(call);
if (containingClass == null) {
return;
}
PsiMethod method = call.resolveMethod();
if (method == null) {
return;
}
if (!containingClass.equals(method.getContainingClass())) {
return;
}
PsiReferenceExpression methodExpression = call.getMethodExpression();
PsiExpression qualifier = methodExpression.getQualifierExpression();
if (qualifier != null && !(qualifier instanceof PsiThisExpression)) {
if (ignoreGetterCallsOnOtherObjects
|| !(qualifier.getType() instanceof PsiClassType classType)) {
return;
}
PsiClass qualifierClass = classType.resolve();
if (!containingClass.equals(qualifierClass)) {
return;
}
}
if (!PropertyUtil.isSimpleGetter(method)) {
return;
}
if (onlyReportPrivateGetter && !method.isPrivate()) {
return;
}
Query<PsiMethod> query = OverridingMethodsSearch.search(method, true);
PsiMethod overridingMethod = query.findFirst();
if (overridingMethod != null) {
return;
}
registerMethodCallError(call);
}
}
if (!PropertyUtil.isSimpleGetter(method)) {
return;
}
if (onlyReportPrivateGetter && !method.hasModifierProperty(PsiModifier.PRIVATE)) {
return;
}
final Query<PsiMethod> query = OverridingMethodsSearch.search(method, true);
final PsiMethod overridingMethod = query.findFirst();
if (overridingMethod != null) {
return;
}
registerMethodCallError(call);
}
}
}
Loading
Loading