Merge pull request #127 from unv-unv/unv/inspection-gadgets-localize-14

InspectionGadgetsBundle → InspectionGadgetsLocalize (part 14).
consulo · Jul 23, 2024 · b8075ee · b8075ee
2 parents 3b2e69d + 9cc45e7
commit b8075ee
Show file tree

Hide file tree

Showing 41 changed files with 374 additions and 447 deletions.
diff --git a/...c/main/java/com/intellij/java/impl/ig/abstraction/ParameterOfConcreteClassInspection.java b/...c/main/java/com/intellij/java/impl/ig/abstraction/ParameterOfConcreteClassInspection.java
@@ -15,17 +15,18 @@
  */
 package com.intellij.java.impl.ig.abstraction;
 
-import consulo.annotation.component.ExtensionImpl;
-import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel;
 import com.intellij.java.language.psi.PsiCatchSection;
 import com.intellij.java.language.psi.PsiParameter;
 import com.intellij.java.language.psi.PsiTypeElement;
-import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
+import com.siyeh.localize.InspectionGadgetsLocalize;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
-import javax.swing.JComponent;
+import javax.swing.*;
 
 @ExtensionImpl
 public class ParameterOfConcreteClassInspection extends BaseInspection {
@@ -42,24 +43,19 @@ public String getID() {
   @Override
   @Nonnull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-      "concrete.class.method.parameter.display.name");
+    return InspectionGadgetsLocalize.concreteClassMethodParameterDisplayName().get();
   }
 
   @Override
   @Nonnull
   public String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message(
-      "concrete.class.method.parameter.problem.descriptor",
-      infos);
+    return InspectionGadgetsLocalize.concreteClassMethodParameterProblemDescriptor(infos).get();
   }
 
   @Override
   public JComponent createOptionsPanel() {
-    return new SingleCheckboxOptionsPanel(
-      InspectionGadgetsBundle.message(
-        "parameter.of.concrete.class.option"),
-      this, "ignoreAbstractClasses");
+    LocalizeValue message = InspectionGadgetsLocalize.parameterOfConcreteClassOption();
+    return new SingleCheckboxOptionsPanel(message.get(), this, "ignoreAbstractClasses");
   }
 
   @Override

diff --git a/...va/com/intellij/java/impl/ig/abstraction/PublicMethodNotExposedInInterfaceInspection.java b/...va/com/intellij/java/impl/ig/abstraction/PublicMethodNotExposedInInterfaceInspection.java
@@ -29,6 +29,7 @@
 import com.siyeh.ig.InspectionGadgetsFix;
 import com.siyeh.ig.psiutils.TestUtils;
 import com.siyeh.ig.ui.ExternalizableStringSet;
+import com.siyeh.localize.InspectionGadgetsLocalize;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.deadCodeNotWorking.impl.CheckBox;
 import consulo.java.language.module.util.JavaClassNames;
@@ -51,15 +52,13 @@ public class PublicMethodNotExposedInInterfaceInspection
   @Override
   @Nonnull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-      "public.method.not.in.interface.display.name");
+    return InspectionGadgetsLocalize.publicMethodNotInInterfaceDisplayName().get();
   }
 
   @Override
   @Nonnull
   protected String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message(
-      "public.method.not.in.interface.problem.descriptor");
+    return InspectionGadgetsLocalize.publicMethodNotInInterfaceProblemDescriptor().get();
   }
 
   @Nonnull
@@ -72,7 +71,9 @@ protected InspectionGadgetsFix[] buildFixes(Object... infos) {
   public JComponent createOptionsPanel() {
     final JPanel panel = new JPanel(new GridBagLayout());
     final JPanel annotationsListControl = SpecialAnnotationsUtil.createSpecialAnnotationsListControl(
-        ignorableAnnotations, InspectionGadgetsBundle.message("ignore.if.annotated.by"));
+      ignorableAnnotations,
+      InspectionGadgetsLocalize.ignoreIfAnnotatedBy().get()
+    );
     final GridBagConstraints constraints = new GridBagConstraints();
     constraints.gridx = 0;
     constraints.gridy = 0;
@@ -81,8 +82,11 @@ public JComponent createOptionsPanel() {
     constraints.anchor = GridBagConstraints.CENTER;
     constraints.fill = GridBagConstraints.BOTH;
     panel.add(annotationsListControl, constraints);
-    final CheckBox checkBox = new CheckBox(InspectionGadgetsBundle.message(
-      "public.method.not.in.interface.option"), this, "onlyWarnIfContainingClassImplementsAnInterface");
+    final CheckBox checkBox = new CheckBox(
+        InspectionGadgetsLocalize.publicMethodNotInInterfaceOption().get(),
+        this,
+        "onlyWarnIfContainingClassImplementsAnInterface"
+    );
     constraints.gridy = 1;
     constraints.weighty = 0.0;
     constraints.anchor = GridBagConstraints.WEST;

diff --git a/...src/main/java/com/intellij/java/impl/ig/bitwise/PointlessBitwiseExpressionInspection.java b/...src/main/java/com/intellij/java/impl/ig/bitwise/PointlessBitwiseExpressionInspection.java
@@ -15,22 +15,23 @@
  */
 package com.intellij.java.impl.ig.bitwise;
 
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.editor.inspection.ProblemDescriptor;
-import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel;
 import com.intellij.java.language.psi.*;
-import consulo.project.Project;
-import consulo.language.ast.IElementType;
 import com.intellij.java.language.psi.util.ConstantExpressionUtil;
-import consulo.language.util.IncorrectOperationException;
 import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.InspectionGadgetsFix;
 import com.siyeh.ig.psiutils.ExpressionUtils;
+import com.siyeh.localize.InspectionGadgetsLocalize;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel;
 import consulo.java.language.module.util.JavaClassNames;
-import org.jetbrains.annotations.NonNls;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
 import jakarta.annotation.Nonnull;
+import org.jetbrains.annotations.NonNls;
 
 import javax.swing.*;
 import java.util.HashSet;
@@ -59,20 +60,15 @@ public class PointlessBitwiseExpressionInspection extends BaseInspection {
   @Override
   @Nonnull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-      "pointless.bitwise.expression.display.name");
+    return InspectionGadgetsLocalize.pointlessBitwiseExpressionDisplayName().get();
   }
 
   @Override
   @Nonnull
   public String buildErrorString(Object... infos) {
-    final PsiPolyadicExpression polyadicExpression =
-      (PsiPolyadicExpression)infos[0];
-    final String replacementExpression =
-      calculateReplacementExpression(polyadicExpression);
-    return InspectionGadgetsBundle.message(
-      "expression.can.be.replaced.problem.descriptor",
-      replacementExpression);
+    final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)infos[0];
+    final String replacementExpression = calculateReplacementExpression(polyadicExpression);
+    return InspectionGadgetsLocalize.expressionCanBeReplacedProblemDescriptor(replacementExpression).get();
   }
 
   @Override
@@ -174,8 +170,7 @@ private class PointlessBitwiseFix extends InspectionGadgetsFix {
 
     @Nonnull
     public String getName() {
-      return InspectionGadgetsBundle.message(
-        "pointless.bitwise.expression.simplify.quickfix");
+      return InspectionGadgetsLocalize.pointlessBitwiseExpressionSimplifyQuickfix().get();
     }
 
     @Override

diff --git a/...a/com/intellij/java/impl/ig/bugs/PrimitiveArrayArgumentToVariableArgMethodInspection.java b/...a/com/intellij/java/impl/ig/bugs/PrimitiveArrayArgumentToVariableArgMethodInspection.java
@@ -15,29 +15,28 @@
  */
 package com.intellij.java.impl.ig.bugs;
 
-import jakarta.annotation.Nonnull;
-
 import com.intellij.java.language.psi.*;
 import com.intellij.java.language.psi.util.PsiUtil;
 import com.intellij.java.language.psi.util.TypeConversionUtil;
-import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
+import com.siyeh.localize.InspectionGadgetsLocalize;
 import consulo.annotation.component.ExtensionImpl;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class PrimitiveArrayArgumentToVariableArgMethodInspection extends BaseInspection {
 
   @Override
   @Nonnull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message("primitive.array.argument.to.var.arg.method.display.name");
+    return InspectionGadgetsLocalize.primitiveArrayArgumentToVarArgMethodDisplayName().get();
   }
 
   @Override
   @Nonnull
   public String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message("primitive.array.argument.to.var.arg.method.problem.descriptor");
+    return InspectionGadgetsLocalize.primitiveArrayArgumentToVarArgMethodProblemDescriptor().get();
   }
 
   @Override

diff --git a/...ain/java/com/intellij/java/impl/ig/bugs/ReflectionForUnavailableAnnotationInspection.java b/...ain/java/com/intellij/java/impl/ig/bugs/ReflectionForUnavailableAnnotationInspection.java
@@ -15,14 +15,13 @@
  */
 package com.intellij.java.impl.ig.bugs;
 
-import jakarta.annotation.Nonnull;
-
 import com.intellij.java.language.psi.*;
-import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.psiutils.TypeUtils;
+import com.siyeh.localize.InspectionGadgetsLocalize;
 import consulo.annotation.component.ExtensionImpl;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
@@ -31,13 +30,13 @@ public class ReflectionForUnavailableAnnotationInspection extends BaseInspection
   @Override
   @Nonnull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message("reflection.for.unavailable.annotation.display.name");
+    return InspectionGadgetsLocalize.reflectionForUnavailableAnnotationDisplayName().get();
   }
 
   @Override
   @Nonnull
   public String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message("reflection.for.unavailable.annotation.problem.descriptor");
+    return InspectionGadgetsLocalize.reflectionForUnavailableAnnotationProblemDescriptor().get();
   }
 
   @Override

diff --git a/...in/src/main/java/com/intellij/java/impl/ig/classlayout/NonFinalFieldInEnumInspection.java b/...in/src/main/java/com/intellij/java/impl/ig/classlayout/NonFinalFieldInEnumInspection.java
@@ -15,18 +15,18 @@
  */
 package com.intellij.java.impl.ig.classlayout;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
+import com.intellij.java.impl.ig.fixes.MakeFieldFinalFix;
 import com.intellij.java.language.psi.PsiClass;
 import com.intellij.java.language.psi.PsiField;
 import com.intellij.java.language.psi.PsiModifier;
-import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.InspectionGadgetsFix;
-import com.intellij.java.impl.ig.fixes.MakeFieldFinalFix;
+import com.siyeh.localize.InspectionGadgetsLocalize;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.Nls;
 
 /**
@@ -39,14 +39,15 @@ public class NonFinalFieldInEnumInspection extends BaseInspection {
   @Nonnull
   @Override
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message("non.final.field.in.enum.display.name");
+    return InspectionGadgetsLocalize.nonFinalFieldInEnumDisplayName().get();
   }
 
   @Nonnull
   @Override
+  @RequiredReadAction
   protected String buildErrorString(Object... infos) {
     final PsiClass enumClass = (PsiClass)infos[0];
-    return InspectionGadgetsBundle.message("non.final.field.in.enum.problem.descriptor", enumClass.getName());
+    return InspectionGadgetsLocalize.nonFinalFieldInEnumProblemDescriptor(enumClass.getName()).get();
   }
 
   @Nullable

diff --git a/...ain/java/com/intellij/java/impl/ig/classlayout/ProtectedMemberInFinalClassInspection.java b/...ain/java/com/intellij/java/impl/ig/classlayout/ProtectedMemberInFinalClassInspection.java
@@ -15,49 +15,50 @@
  */
 package com.intellij.java.impl.ig.classlayout;
 
-import consulo.language.editor.refactoring.localize.RefactoringLocalize;
-import jakarta.annotation.Nonnull;
-
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.editor.inspection.ProblemDescriptor;
-import com.intellij.java.language.psi.*;
-import consulo.application.AccessToken;
-import consulo.application.WriteAction;
-import consulo.project.Project;
-import consulo.language.psi.*;
-import com.intellij.java.language.impl.psi.impl.source.resolve.JavaResolveUtil;
+import com.intellij.java.impl.ig.fixes.RemoveModifierFix;
 import com.intellij.java.indexing.search.searches.OverridingMethodsSearch;
-import consulo.language.psi.search.ReferencesSearch;
+import com.intellij.java.language.impl.psi.impl.source.resolve.JavaResolveUtil;
+import com.intellij.java.language.psi.*;
 import com.intellij.java.language.psi.search.searches.SuperMethodsSearch;
 import com.intellij.java.language.psi.util.MethodSignatureBackedByPsiMethod;
-import consulo.language.psi.util.PsiTreeUtil;
-import consulo.language.editor.refactoring.RefactoringBundle;
-import consulo.language.editor.refactoring.ui.ConflictsDialog;
-import consulo.language.editor.refactoring.ui.RefactoringUIUtil;
-import consulo.language.util.IncorrectOperationException;
-import consulo.application.util.function.Processor;
-import consulo.application.util.query.Query;
-import consulo.util.collection.MultiMap;
-import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.InspectionGadgetsFix;
-import com.intellij.java.impl.ig.fixes.RemoveModifierFix;
 import com.siyeh.ig.psiutils.MethodUtils;
+import com.siyeh.localize.InspectionGadgetsLocalize;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.application.AccessToken;
+import consulo.application.WriteAction;
+import consulo.application.util.function.Processor;
+import consulo.application.util.query.Query;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.editor.refactoring.localize.RefactoringLocalize;
+import consulo.language.editor.refactoring.ui.ConflictsDialog;
+import consulo.language.editor.refactoring.ui.RefactoringUIUtil;
+import consulo.language.psi.PsiBundle;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiReference;
+import consulo.language.psi.search.ReferencesSearch;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+import consulo.util.collection.MultiMap;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ProtectedMemberInFinalClassInspection extends BaseInspection {
 
   @Override
   @Nonnull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message("protected.member.in.final.class.display.name");
+    return InspectionGadgetsLocalize.protectedMemberInFinalClassDisplayName().get();
   }
 
   @Override
   @Nonnull
   public String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message("protected.member.in.final.class.problem.descriptor");
+    return InspectionGadgetsLocalize.protectedMemberInFinalClassProblemDescriptor().get();
   }
 
   @Override
@@ -78,7 +79,7 @@ private static class MakePrivateFix extends InspectionGadgetsFix {
 
     @Nonnull
     public String getName() {
-      return InspectionGadgetsBundle.message("make.private.quickfix");
+      return InspectionGadgetsLocalize.makePrivateQuickfix().get();
     }
 
     @Override
@@ -102,20 +103,26 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
           @Override
           public boolean process(MethodSignatureBackedByPsiMethod methodSignature) {
             final PsiMethod superMethod = methodSignature.getMethod();
-              conflicts.putValue(superMethod, InspectionGadgetsBundle.message(
-                "0.will.have.incompatible.access.privileges.with.super.1",
-                RefactoringUIUtil.getDescription(method, false),
-                RefactoringUIUtil.getDescription(superMethod, true)));
+              conflicts.putValue(
+                  superMethod,
+                  InspectionGadgetsLocalize.zeroWillHaveIncompatibleAccessPrivilegesWithSuper1(
+                      RefactoringUIUtil.getDescription(method, false),
+                      RefactoringUIUtil.getDescription(superMethod, true)
+                  ).get()
+              );
             return true;
           }
         });
       OverridingMethodsSearch.search(method).forEach(new Processor<PsiMethod>() {
         @Override
         public boolean process(PsiMethod overridingMethod) {
-            conflicts.putValue(overridingMethod, InspectionGadgetsBundle.message(
-              "0.will.no.longer.be.visible.from.overriding.1",
-              RefactoringUIUtil.getDescription(method, false),
-              RefactoringUIUtil.getDescription(overridingMethod, true)));
+            conflicts.putValue(
+                overridingMethod,
+                InspectionGadgetsLocalize.zeroWillNoLongerBeVisibleFromOverriding1(
+                    RefactoringUIUtil.getDescription(method, false),
+                    RefactoringUIUtil.getDescription(overridingMethod, true)
+                ).get()
+            );
           return false;
         }
       });