Merge branch 'master' of github.com:consulo/consulo-java

java-analysis-impl/src/main/java/com/siyeh/ig/bugs/EqualsWithItselfInspection.java

@@ -23,6 +23,7 @@
 import com.siyeh.ig.psiutils.MethodCallUtils;
 import com.siyeh.ig.psiutils.ParenthesesUtils;
 import com.siyeh.ig.psiutils.SideEffectChecker;
+import com.siyeh.localize.InspectionGadgetsLocalize;
 import org.jetbrains.annotations.Nls;
 
 import jakarta.annotation.Nonnull;
@@ -35,13 +36,13 @@ public abstract class EqualsWithItselfInspection extends BaseInspection {
   @Nonnull
   @Override
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message("equals.with.itself.display.name");
+    return InspectionGadgetsLocalize.equalsWithItselfDisplayName().get();
   }
 
   @Nonnull
   @Override
   protected String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message("equals.with.itself.problem.descriptor");
+    return InspectionGadgetsLocalize.equalsWithItselfProblemDescriptor().get();
   }
 
   @Override

java-analysis-impl/src/main/java/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java

@@ -16,16 +16,15 @@
 package com.siyeh.ig.fixes;
 
 import com.intellij.java.language.psi.*;
-import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.InspectionGadgetsFix;
 import com.siyeh.ig.psiutils.CommentTracker;
+import com.siyeh.localize.InspectionGadgetsLocalize;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
+import org.jetbrains.annotations.NonNls;
 
 public class DeleteUnnecessaryStatementFix extends InspectionGadgetsFix {
 
@@ -38,8 +37,7 @@ public DeleteUnnecessaryStatementFix(@NonNls String name) {
   @Override
   @Nonnull
   public String getName() {
-    return InspectionGadgetsBundle.message(
-        "smth.unnecessary.remove.quickfix", name);
+    return InspectionGadgetsLocalize.smthUnnecessaryRemoveQuickfix(name).get();
   }
 
   @Nonnull

java-analysis-impl/src/main/java/com/siyeh/ig/inheritance/ExtendsConcreteCollectionInspectionBase.java

@@ -16,12 +16,11 @@
 package com.siyeh.ig.inheritance;
 
 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.CollectionUtils;
 import com.siyeh.ig.psiutils.TypeUtils;
-
+import com.siyeh.localize.InspectionGadgetsLocalize;
 import jakarta.annotation.Nonnull;
 
 public abstract class ExtendsConcreteCollectionInspectionBase extends BaseInspection {
@@ -34,19 +33,17 @@ public String getID() {
   @Override
   @Nonnull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message("extends.concrete.collection.display.name");
+    return InspectionGadgetsLocalize.extendsConcreteCollectionDisplayName().get();
   }
 
   @Override
   @Nonnull
   public String buildErrorString(Object... infos) {
     final PsiClass superClass = (PsiClass) infos[0];
     final PsiClass aClass = (PsiClass) infos[1];
-    if (aClass instanceof PsiAnonymousClass) {
-      return InspectionGadgetsBundle.message("anonymous.extends.concrete.collection.problem.descriptor", superClass.getQualifiedName());
-    } else {
-      return InspectionGadgetsBundle.message("extends.concrete.collection.problem.descriptor", superClass.getQualifiedName());
-    }
+    return aClass instanceof PsiAnonymousClass
+      ? InspectionGadgetsLocalize.anonymousExtendsConcreteCollectionProblemDescriptor(superClass.getQualifiedName()).get()
+      : InspectionGadgetsLocalize.extendsConcreteCollectionProblemDescriptor(superClass.getQualifiedName()).get();
   }
 
   @Override
@@ -55,7 +52,6 @@ public BaseInspectionVisitor buildVisitor() {
   }
 
   private static class ExtendsConcreteCollectionVisitor extends BaseInspectionVisitor {
-
     @Override
     public void visitClass(@Nonnull PsiClass aClass) {
       if (aClass.isInterface() || aClass.isAnnotationType() || aClass.isEnum()) {

java-analysis-impl/src/main/java/com/siyeh/ig/memory/ZeroLengthArrayInitializationInspectionBase.java

@@ -18,14 +18,13 @@
 import com.intellij.java.language.psi.PsiArrayInitializerExpression;
 import com.intellij.java.language.psi.PsiExpression;
 import com.intellij.java.language.psi.PsiNewExpression;
-import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.psiutils.ConstructionUtils;
 import com.siyeh.ig.psiutils.ExpressionUtils;
-import org.intellij.lang.annotations.Pattern;
-
+import com.siyeh.localize.InspectionGadgetsLocalize;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 
 public abstract class ZeroLengthArrayInitializationInspectionBase extends BaseInspection {
   @Pattern(VALID_ID_PATTERN)
@@ -38,13 +37,13 @@ public String getID() {
   @Override
   @Nonnull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message("array.allocation.zero.length.display.name");
+    return InspectionGadgetsLocalize.arrayAllocationZeroLengthDisplayName().get();
   }
 
   @Override
   @Nonnull
   public String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message("array.allocation.zero.length.problem.descriptor");
+    return InspectionGadgetsLocalize.arrayAllocationZeroLengthProblemDescriptor().get();
   }
 
   @Override

java-analysis-impl/src/main/java/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java

@@ -16,22 +16,22 @@
 package com.siyeh.ig.numeric;
 
 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.ig.psiutils.ClassUtils;
 import com.siyeh.ig.psiutils.ExpectedTypeUtils;
 import com.siyeh.ig.psiutils.ExpressionUtils;
+import com.siyeh.localize.InspectionGadgetsLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.editor.inspection.ProblemHighlightType;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.project.Project;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.Nls;
 
-import jakarta.annotation.Nonnull;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -60,14 +60,14 @@ public abstract class UnnecessaryExplicitNumericCastInspection extends BaseInspe
   @Nonnull
   @Override
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message("unnecessary.explicit.numeric.cast.display.name");
+    return InspectionGadgetsLocalize.unnecessaryExplicitNumericCastDisplayName().get();
   }
 
   @Nonnull
   @Override
   protected String buildErrorString(Object... infos) {
     final PsiExpression expression = (PsiExpression) infos[0];
-    return InspectionGadgetsBundle.message("unnecessary.explicit.numeric.cast.problem.descriptor", expression.getText());
+    return InspectionGadgetsLocalize.unnecessaryExplicitNumericCastProblemDescriptor(expression.getText()).get();
   }
 
   @Override
@@ -80,7 +80,7 @@ private static class UnnecessaryExplicitNumericCastFix extends InspectionGadgets
     @Nonnull
     @Override
     public String getName() {
-      return InspectionGadgetsBundle.message("unnecessary.explicit.numeric.cast.quickfix");
+      return InspectionGadgetsLocalize.unnecessaryExplicitNumericCastQuickfix().get();
     }
 
     @Override

java-analysis-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.analysis.impl.JavaInspectionsLocalize.yaml

@@ -47,7 +47,7 @@ inspection.can.be.final.option1:
 inspection.can.be.final.option2:
   text: Report fields
 inspection.data.flow.display.name:
-  text: Constant conditions \& exceptions
+  text: Constant conditions & exceptions
 inspection.contract.display.name:
   text: Contract issues
 inspection.data.flow.nullable.quickfix.option:

java-analysis-impl/src/main/resources/com/siyeh/InspectionGadgetsBundle.properties

@@ -1347,7 +1347,7 @@ boolean.constructor.simplify.quickfix=Simplify
 unnecessary.temporary.on.conversion.from.string.problem.descriptor=<code>#ref</code> #loc can be simplified to ''{0}''
 unnecessary.temporary.on.conversion.from.string.fix.name=Replace with ''{0}''
 only.report.qualified.static.usages.option=Only report qualified static access from a static context
-unqualified,static.usage.only.report.static.usages.option=Only report static access from a non-static context
+unqualified.static.usage.only.report.static.usages.option=Only report static access from a non-static context
 assignment.to.catch.block.parameter.problem.descriptor=Assignment to 'catch' block parameter <code>#ref</code> #loc
 assignment.to.method.parameter.problem.descriptor=Assignment to method parameter <code>#ref</code> #loc
 value.of.post.increment.problem.descriptor=Value of post-increment expression <code>#ref</code> is used #loc
@@ -1650,6 +1650,7 @@ char.used.in.arithmetic.context.display.name=Char expression used in arithmetic
 char.used.in.arithmetic.context.problem.descriptor='char' <code>#ref</code> used in arithmetic context #loc
 char.used.in.arithmetic.context.quickfix=Convert to String literal
 char.used.in.arithmetic.context.cast.quickfix=Insert cast to {0}
+ignore.parentheses.around.single.no.formal.type.lambda.parameter=Ignore parentheses around single no formal type lambda parameter
 unnecessary.constant.array.creation.expression.display.name=Redundant 'new' expression in constant array creation
 unnecessary.constant.array.creation.expression.problem.descriptor=<code>#ref</code> can be replaced with array initializer expression #loc
 unnecessary.constant.array.creation.expression.quickfix=Remove ''new {0}''

plugin/src/main/java/com/intellij/java/impl/codeInsight/intention/impl/ReplaceAssignmentWithComparisonFix.java

@@ -19,18 +19,17 @@
 import com.intellij.java.language.psi.PsiAssignmentExpression;
 import com.intellij.java.language.psi.PsiBinaryExpression;
 import com.intellij.java.language.psi.PsiExpression;
-import com.siyeh.InspectionGadgetsBundle;
+import com.siyeh.localize.InspectionGadgetsLocalize;
 import consulo.codeEditor.Editor;
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.editor.inspection.LocalQuickFixAndIntentionActionOnPsiElement;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.project.Project;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.Nls;
 
-import jakarta.annotation.Nonnull;
-
 public class ReplaceAssignmentWithComparisonFix extends LocalQuickFixAndIntentionActionOnPsiElement {
   public ReplaceAssignmentWithComparisonFix(PsiAssignmentExpression expr) {
     super(expr);
@@ -59,6 +58,6 @@ public String getText() {
   @Nonnull
   @Override
   public String getFamilyName() {
-    return InspectionGadgetsBundle.message("assignment.used.as.condition.replace.quickfix");
+    return InspectionGadgetsLocalize.assignmentUsedAsConditionReplaceQuickfix().get();
   }
 }

plugin/src/main/java/com/intellij/java/impl/codeInspection/ReplaceTypeInCastFix.java

@@ -5,12 +5,11 @@
 import com.intellij.java.language.psi.PsiElementFactory;
 import com.intellij.java.language.psi.PsiType;
 import com.intellij.java.language.psi.PsiTypeElement;
-import com.siyeh.InspectionGadgetsBundle;
+import com.siyeh.localize.InspectionGadgetsLocalize;
 import consulo.language.editor.inspection.LocalQuickFix;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.project.Project;
 import consulo.util.lang.ObjectUtil;
-
 import jakarta.annotation.Nonnull;
 
 public class ReplaceTypeInCastFix implements LocalQuickFix {
@@ -27,7 +26,7 @@ public ReplaceTypeInCastFix(PsiType existingType, PsiType wantedType) {
   @Override
   @Nonnull
   public String getName() {
-    return InspectionGadgetsBundle.message("cast.conflicts.with.instanceof.quickfix1", myExistingTypeText, myWantedTypeText);
+    return InspectionGadgetsLocalize.castConflictsWithInstanceofQuickfix1(myExistingTypeText, myWantedTypeText).get();
   }
 
   @Nonnull

plugin/src/main/java/com/intellij/java/impl/codeInspection/dataFlow/DataFlowInspection.java

@@ -34,20 +34,20 @@
 import com.siyeh.ig.psiutils.SideEffectChecker;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.java.analysis.impl.localize.JavaInspectionsLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.editor.inspection.LocalQuickFix;
 import consulo.language.editor.inspection.LocalQuickFixOnPsiElement;
-import consulo.language.editor.inspection.localize.InspectionLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
 import consulo.logging.Logger;
 import consulo.util.collection.ContainerUtil;
 import consulo.util.collection.SmartList;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import javax.swing.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -84,7 +84,7 @@ protected LocalQuickFix[] createConditionalAssignmentFixes(boolean evaluatesToTr
 	@Override
 	public String getDisplayName()
 	{
-		return InspectionLocalize.inspectionDataFlowDisplayName().get();
+		return JavaInspectionsLocalize.inspectionDataFlowDisplayName().get();
 	}
 
 	@Override

plugin/src/main/java/com/intellij/java/impl/ig/abstraction/ClassReferencesSubclassInspection.java

@@ -51,9 +51,7 @@ public BaseInspectionVisitor buildVisitor() {
     return new ClassReferencesSubclassVisitor();
   }
 
-  private static class ClassReferencesSubclassVisitor
-    extends BaseInspectionVisitor {
-
+  private static class ClassReferencesSubclassVisitor extends BaseInspectionVisitor {
     @Override
     public void visitVariable(@Nonnull PsiVariable variable) {
       final PsiTypeElement typeElement = variable.getTypeElement();

plugin/src/main/java/com/intellij/java/impl/ig/abstraction/DeclareCollectionAsInterfaceInspection.java

@@ -19,21 +19,21 @@
 import com.intellij.java.impl.ig.psiutils.WeakestTypeFinder;
 import com.intellij.java.language.psi.*;
 import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager;
-import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.InspectionGadgetsFix;
 import com.siyeh.ig.psiutils.CollectionUtils;
 import com.siyeh.ig.psiutils.DeclarationSearchUtils;
+import com.siyeh.localize.InspectionGadgetsLocalize;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.deadCodeNotWorking.impl.MultipleCheckboxOptionsPanel;
+import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -63,24 +63,30 @@ public String getID()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionGadgetsBundle.message("collection.declared.by.class.display.name");
+		return InspectionGadgetsLocalize.collectionDeclaredByClassDisplayName().get();
 	}
 
 	@Override
 	@Nonnull
 	public String buildErrorString(Object... infos)
 	{
 		final String type = (String) infos[0];
-		return InspectionGadgetsBundle.message("collection.declared.by.class.problem.descriptor", type);
+		return InspectionGadgetsLocalize.collectionDeclaredByClassProblemDescriptor(type).get();
 	}
 
 	@Override
 	@Nullable
 	public JComponent createOptionsPanel()
 	{
 		final MultipleCheckboxOptionsPanel optionsPanel = new MultipleCheckboxOptionsPanel(this);
-		optionsPanel.addCheckbox(InspectionGadgetsBundle.message("collection.declared.by.class.ignore.locals.option"), "ignoreLocalVariables");
-		optionsPanel.addCheckbox(InspectionGadgetsBundle.message("collection.declared.by.class.ignore.private.members.option"), "ignorePrivateMethodsAndFields");
+		optionsPanel.addCheckbox(
+			InspectionGadgetsLocalize.collectionDeclaredByClassIgnoreLocalsOption().get(),
+			"ignoreLocalVariables"
+		);
+		optionsPanel.addCheckbox(
+			InspectionGadgetsLocalize.collectionDeclaredByClassIgnorePrivateMembersOption().get(),
+			"ignorePrivateMethodsAndFields"
+		);
 		return optionsPanel;
 	}
 
@@ -104,7 +110,7 @@ private static class DeclareCollectionAsInterfaceFix extends InspectionGadgetsFi
 		@Nonnull
 		public String getName()
 		{
-			return InspectionGadgetsBundle.message("declare.collection.as.interface.quickfix", typeString);
+			return InspectionGadgetsLocalize.declareCollectionAsInterfaceQuickfix(typeString).get();
 		}
 
 		@Nonnull