Merge pull request #113 from unv-unv/unv/inspection-gadgets-localize-1

InspectionGadgetsBundle → InspectionGadgetsLocalize (part 1).
consulo · Jul 19, 2024 · 67e62f8 · 67e62f8
2 parents 27e9a51 + 0ee6a8b
commit 67e62f8
Show file tree

Hide file tree

Showing 50 changed files with 378 additions and 488 deletions.
diff --git a/java-analysis-impl/src/main/java/module-info.java b/java-analysis-impl/src/main/java/module-info.java
@@ -84,6 +84,7 @@
   exports com.siyeh.ig.numeric;
   exports com.siyeh.ig.psiutils;
   exports com.siyeh.ig.ui;
+  exports com.siyeh.localize;
   exports consulo.java.analysis.impl;
   exports consulo.java.analysis.impl.codeInsight;
   exports consulo.java.analysis.impl.codeInsight.completion;

diff --git a/.../java/com/intellij/java/impl/ig/assignment/AssignmentToCatchBlockParameterInspection.java b/.../java/com/intellij/java/impl/ig/assignment/AssignmentToCatchBlockParameterInspection.java
@@ -18,10 +18,10 @@
 import com.intellij.java.impl.ig.fixes.ExtractParameterAsLocalVariableFix;
 import com.intellij.java.impl.ig.psiutils.WellFormednessUtils;
 import com.intellij.java.language.psi.*;
-import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.InspectionGadgetsFix;
+import com.siyeh.localize.InspectionGadgetsLocalize;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import jakarta.annotation.Nonnull;
@@ -32,15 +32,13 @@ public class AssignmentToCatchBlockParameterInspection extends BaseInspection {
   @Override
   @Nonnull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-        "assignment.to.catch.block.parameter.display.name");
+    return InspectionGadgetsLocalize.assignmentToCatchBlockParameterDisplayName().get();
   }
 
   @Override
   @Nonnull
   public String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message(
-        "assignment.to.catch.block.parameter.problem.descriptor");
+    return InspectionGadgetsLocalize.assignmentToCatchBlockParameterProblemDescriptor().get();
   }
 
   @Override

diff --git a/.../intellij/java/impl/ig/assignment/AssignmentToCollectionFieldFromParameterInspection.java b/.../intellij/java/impl/ig/assignment/AssignmentToCollectionFieldFromParameterInspection.java
@@ -16,15 +16,18 @@
 package com.intellij.java.impl.ig.assignment;
 
 import com.intellij.java.language.psi.*;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.psi.*;
-import consulo.language.ast.IElementType;
-import consulo.language.psi.util.PsiTreeUtil;
-import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel;
-import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.psiutils.CollectionUtils;
+import com.siyeh.localize.InspectionGadgetsLocalize;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiReference;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -46,33 +49,24 @@ public String getID() {
 
   @Nonnull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-      "assignment.collection.array.field.from.parameter.display.name");
+    return InspectionGadgetsLocalize.assignmentCollectionArrayFieldFromParameterDisplayName().get();
   }
 
   @Nonnull
+  @RequiredReadAction
   public String buildErrorString(Object... infos) {
     final PsiExpression rhs = (PsiExpression)infos[0];
     final PsiField field = (PsiField)infos[1];
     final PsiType type = field.getType();
-    if (type instanceof PsiArrayType) {
-      return InspectionGadgetsBundle.message(
-        "assignment.collection.array.field.from.parameter.problem.descriptor.array",
-        rhs.getText());
-    }
-    else {
-      return InspectionGadgetsBundle.message(
-        "assignment.collection.array.field.from.parameter.problem.descriptor.collection",
-        rhs.getText());
-    }
+    return type instanceof PsiArrayType
+      ? InspectionGadgetsLocalize.assignmentCollectionArrayFieldFromParameterProblemDescriptorArray(rhs.getText()).get()
+      : InspectionGadgetsLocalize.assignmentCollectionArrayFieldFromParameterProblemDescriptorCollection(rhs.getText()).get();
   }
 
   @Nullable
   public JComponent createOptionsPanel() {
-    return new SingleCheckboxOptionsPanel(
-      InspectionGadgetsBundle.message(
-        "assignment.collection.array.field.option"), this,
-      "ignorePrivateMethods");
+    LocalizeValue message = InspectionGadgetsLocalize.assignmentCollectionArrayFieldOption();
+    return new SingleCheckboxOptionsPanel(message.get(), this, "ignorePrivateMethods");
   }
 
   public BaseInspectionVisitor buildVisitor() {

diff --git a/...va/com/intellij/java/impl/ig/assignment/AssignmentToDateFieldFromParameterInspection.java b/...va/com/intellij/java/impl/ig/assignment/AssignmentToDateFieldFromParameterInspection.java
@@ -16,20 +16,22 @@
 package com.intellij.java.impl.ig.assignment;
 
 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.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel;
 import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.ast.IElementType;
-import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiReference;
 import consulo.language.psi.util.PsiTreeUtil;
-
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import javax.swing.*;
 
 @ExtensionImpl
@@ -43,27 +45,23 @@ public class AssignmentToDateFieldFromParameterInspection extends BaseInspection
   @Override
   @Nonnull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-      "assignment.to.date.calendar.field.from.parameter.display.name");
+    return InspectionGadgetsLocalize.assignmentToDateCalendarFieldFromParameterDisplayName().get();
   }
 
   @Override
   @Nonnull
+  @RequiredReadAction
   public String buildErrorString(Object... infos) {
     final String type = (String)infos[0];
     final PsiExpression rhs = (PsiExpression)infos[1];
-    return InspectionGadgetsBundle.message(
-      "assignment.to.date.calendar.field.from.parameter.problem.descriptor",
-      type, rhs.getText());
+    return InspectionGadgetsLocalize.assignmentToDateCalendarFieldFromParameterProblemDescriptor(type, rhs.getText()).get();
   }
 
   @Override
   @Nullable
   public JComponent createOptionsPanel() {
-    return new SingleCheckboxOptionsPanel(
-      InspectionGadgetsBundle.message(
-        "assignment.collection.array.field.option"), this,
-      "ignorePrivateMethods");
+    LocalizeValue message = InspectionGadgetsLocalize.assignmentCollectionArrayFieldOption();
+    return new SingleCheckboxOptionsPanel(message.get(), this, "ignorePrivateMethods");
   }
 
   @Override

diff --git a/...ain/java/com/intellij/java/impl/ig/assignment/AssignmentToForLoopParameterInspection.java b/...ain/java/com/intellij/java/impl/ig/assignment/AssignmentToForLoopParameterInspection.java
@@ -18,18 +18,19 @@
 import com.intellij.java.impl.ig.fixes.ExtractParameterAsLocalVariableFix;
 import com.intellij.java.impl.ig.psiutils.WellFormednessUtils;
 import com.intellij.java.language.psi.*;
-import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.InspectionGadgetsFix;
+import com.siyeh.localize.InspectionGadgetsLocalize;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.language.ast.IElementType;
 import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel;
+import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
-
 import jakarta.annotation.Nullable;
+
 import javax.swing.*;
 
 @ExtensionImpl
@@ -44,24 +45,20 @@ public class AssignmentToForLoopParameterInspection
   @Override
   @Nonnull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-      "assignment.to.for.loop.parameter.display.name");
+    return InspectionGadgetsLocalize.assignmentToForLoopParameterDisplayName().get();
   }
 
   @Override
   @Nonnull
   public String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message(
-      "assignment.to.for.loop.parameter.problem.descriptor");
+    return InspectionGadgetsLocalize.assignmentToForLoopParameterProblemDescriptor().get();
   }
 
   @Override
   @Nullable
   public JComponent createOptionsPanel() {
-    return new SingleCheckboxOptionsPanel(
-      InspectionGadgetsBundle.message(
-        "assignment.to.for.loop.parameter.check.foreach.option"),
-      this, "m_checkForeachParameters");
+    LocalizeValue message = InspectionGadgetsLocalize.assignmentToForLoopParameterCheckForeachOption();
+    return new SingleCheckboxOptionsPanel(message.get(), this, "m_checkForeachParameters");
   }
 
   @Override

diff --git a/...main/java/com/intellij/java/impl/ig/assignment/AssignmentToMethodParameterInspection.java b/...main/java/com/intellij/java/impl/ig/assignment/AssignmentToMethodParameterInspection.java
@@ -15,17 +15,18 @@
  */
 package com.intellij.java.impl.ig.assignment;
 
+import com.intellij.java.impl.ig.fixes.ExtractParameterAsLocalVariableFix;
 import com.intellij.java.language.psi.*;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.psi.*;
-import consulo.language.ast.IElementType;
-import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel;
-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.ExtractParameterAsLocalVariableFix;
 import com.siyeh.ig.psiutils.VariableAccessUtils;
+import com.siyeh.localize.InspectionGadgetsLocalize;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -41,23 +42,20 @@ public class AssignmentToMethodParameterInspection
   @Override
   @Nonnull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-      "assignment.to.method.parameter.display.name");
+    return InspectionGadgetsLocalize.assignmentToMethodParameterDisplayName().get();
   }
 
   @Override
   @Nonnull
   public String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message(
-      "assignment.to.method.parameter.problem.descriptor");
+    return InspectionGadgetsLocalize.assignmentToMethodParameterProblemDescriptor().get();
   }
 
   @Override
   @Nullable
   public JComponent createOptionsPanel() {
-    return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message(
-      "assignment.to.method.parameter.ignore.transformation.option"), this,
-                                          "ignoreTransformationOfOriginalParameter");
+    LocalizeValue message = InspectionGadgetsLocalize.assignmentToMethodParameterIgnoreTransformationOption();
+    return new SingleCheckboxOptionsPanel(message.get(), this, "ignoreTransformationOfOriginalParameter");
   }
 
   @Override

diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/assignment/AssignmentToNullInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/assignment/AssignmentToNullInspection.java
@@ -15,18 +15,19 @@
  */
 package com.intellij.java.impl.ig.assignment;
 
-import com.intellij.java.language.codeInsight.NullableNotNullManager;
 import com.intellij.java.analysis.impl.codeInsight.intention.AddAnnotationFix;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel;
+import com.intellij.java.impl.ig.DelegatingFix;
+import com.intellij.java.language.codeInsight.NullableNotNullManager;
 import com.intellij.java.language.psi.*;
-import consulo.language.psi.*;
-import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
-import com.intellij.java.impl.ig.DelegatingFix;
 import com.siyeh.ig.InspectionGadgetsFix;
 import com.siyeh.ig.psiutils.ParenthesesUtils;
+import com.siyeh.localize.InspectionGadgetsLocalize;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel;
+import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 import javax.swing.*;
@@ -40,14 +41,13 @@ public class AssignmentToNullInspection extends BaseInspection {
   @Override
   @Nonnull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message("assignment.to.null.display.name");
+    return InspectionGadgetsLocalize.assignmentToNullDisplayName().get();
   }
 
   @Override
   @Nonnull
   public String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message(
-      "assignment.to.null.problem.descriptor");
+    return InspectionGadgetsLocalize.assignmentToNullProblemDescriptor().get();
   }
 
   @Override
@@ -66,9 +66,8 @@ protected InspectionGadgetsFix buildFix(Object... infos) {
 
   @Override
   public JComponent createOptionsPanel() {
-    return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message(
-      "assignment.to.null.option"), this,
-                                          "ignoreAssignmentsToFields");
+    LocalizeValue message = InspectionGadgetsLocalize.assignmentToNullOption();
+    return new SingleCheckboxOptionsPanel(message.get(), this, "ignoreAssignmentsToFields");
   }
 
   @Override

diff --git a/...intellij/java/impl/ig/assignment/AssignmentToStaticFieldFromInstanceMethodInspection.java b/...intellij/java/impl/ig/assignment/AssignmentToStaticFieldFromInstanceMethodInspection.java
@@ -17,9 +17,9 @@
 
 import com.intellij.java.impl.ig.psiutils.WellFormednessUtils;
 import com.intellij.java.language.psi.*;
-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.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
@@ -33,14 +33,12 @@ public class AssignmentToStaticFieldFromInstanceMethodInspection
 
   @Nonnull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-      "assignment.to.static.field.from.instance.method.display.name");
+    return InspectionGadgetsLocalize.assignmentToStaticFieldFromInstanceMethodDisplayName().get();
   }
 
   @Nonnull
   public String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message(
-      "assignment.to.static.field.from.instance.method.problem.descriptor");
+    return InspectionGadgetsLocalize.assignmentToStaticFieldFromInstanceMethodProblemDescriptor().get();
   }
 
   public BaseInspectionVisitor buildVisitor() {

diff --git a/...main/java/com/intellij/java/impl/ig/assignment/AssignmentToSuperclassFieldInspection.java b/...main/java/com/intellij/java/impl/ig/assignment/AssignmentToSuperclassFieldInspection.java
@@ -17,15 +17,15 @@
 
 import com.intellij.java.language.psi.*;
 import com.intellij.java.language.psi.util.InheritanceUtil;
-import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
+import com.siyeh.localize.InspectionGadgetsLocalize;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
-import org.jetbrains.annotations.Nls;
-
 import jakarta.annotation.Nonnull;
+import org.jetbrains.annotations.Nls;
 
 /**
  * @author Bas Leijdekkers
@@ -37,16 +37,19 @@ public class AssignmentToSuperclassFieldInspection extends BaseInspection {
   @Nonnull
   @Override
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message("assignment.to.superclass.field.display.name");
+    return InspectionGadgetsLocalize.assignmentToSuperclassFieldDisplayName().get();
   }
 
   @Nonnull
   @Override
+  @RequiredReadAction
   protected String buildErrorString(Object... infos) {
     final PsiReferenceExpression referenceExpression = (PsiReferenceExpression) infos[0];
     final PsiClass superclass = (PsiClass) infos[1];
-    return InspectionGadgetsBundle.message("assignment.to.superclass.field.problem.descriptor",
-        referenceExpression.getReferenceName(), superclass.getName());
+    return InspectionGadgetsLocalize.assignmentToSuperclassFieldProblemDescriptor(
+        referenceExpression.getReferenceName(),
+        superclass.getName()
+    ).get();
   }
 
   @Override