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

consulo · Jul 7, 2024 · b9afdf6 · b9afdf6
2 parents ef7248e + a2684a5
commit b9afdf6
Show file tree

Hide file tree

Showing 67 changed files with 873 additions and 698 deletions.
diff --git a/...ntellij/java/impl/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java b/...ntellij/java/impl/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java
@@ -31,7 +31,7 @@
 import consulo.java.impl.codeInsight.JavaTargetElementUtilEx;
 import consulo.language.editor.FileModificationService;
 import consulo.language.editor.intention.SyntheticIntentionAction;
-import consulo.language.editor.refactoring.RefactoringBundle;
+import consulo.language.editor.refactoring.localize.RefactoringLocalize;
 import consulo.language.editor.refactoring.rename.SuggestedNameInfo;
 import consulo.language.editor.util.LanguageUndoUtil;
 import consulo.language.psi.PsiElement;
@@ -43,11 +43,10 @@
 import consulo.usage.UsageInfo;
 import consulo.util.collection.ArrayUtil;
 import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
-import jakarta.annotation.Nonnull;
-
 import java.util.*;
 import java.util.function.Consumer;
 
@@ -180,7 +179,7 @@ public void invoke(@Nonnull final Project project, Editor editor, final PsiFile
       return;
     }
 
-    final PsiMethod method = SuperMethodWarningUtil.checkSuperMethod(myTargetMethod, RefactoringBundle.message("to.refactor"));
+    final PsiMethod method = SuperMethodWarningUtil.checkSuperMethod(myTargetMethod, RefactoringLocalize.toRefactor().get());
     if (method == null) {
       return;
     }

diff --git a/.../com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateParameterFromUsageFix.java b/.../com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateParameterFromUsageFix.java
@@ -28,7 +28,7 @@
 import consulo.application.Result;
 import consulo.java.analysis.impl.JavaQuickFixBundle;
 import consulo.language.editor.WriteCommandAction;
-import consulo.language.editor.refactoring.RefactoringBundle;
+import consulo.language.editor.refactoring.localize.RefactoringLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.util.PsiTreeUtil;
@@ -66,8 +66,8 @@ protected boolean isAvailableImpl(int offset) {
     while (true);
   }
 
-    @Override
-    public String getText(String varName) {
+  @Override
+  public String getText(String varName) {
     return JavaQuickFixBundle.message("create.parameter.from.usage.text", varName);
   }
 
@@ -86,7 +86,7 @@ protected void invokeImpl(PsiClass targetClass) {
     method = IntroduceParameterHandler.chooseEnclosingMethod(method);
     if (method == null) return;
 
-    method = SuperMethodWarningUtil.checkSuperMethod(method, RefactoringBundle.message("to.refactor"));
+    method = SuperMethodWarningUtil.checkSuperMethod(method, RefactoringLocalize.toRefactor().get());
     if (method == null) return;
 
     final List<ParameterInfoImpl> parameterInfos =

diff --git a/...rc/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/VariableTypeFix.java b/...rc/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/VariableTypeFix.java
@@ -28,17 +28,17 @@
 import consulo.language.editor.FileModificationService;
 import consulo.language.editor.WriteCommandAction;
 import consulo.language.editor.inspection.LocalQuickFixAndIntentionActionOnPsiElement;
-import consulo.language.editor.refactoring.RefactoringBundle;
+import consulo.language.editor.refactoring.localize.RefactoringLocalize;
 import consulo.language.editor.util.LanguageUndoUtil;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.util.IncorrectOperationException;
 import consulo.logging.Logger;
 import consulo.project.Project;
 import consulo.usage.UsageViewUtil;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.ArrayList;
 
 public class VariableTypeFix extends LocalQuickFixAndIntentionActionOnPsiElement {
@@ -114,7 +114,7 @@ private boolean changeMethodSignatureIfNeeded(PsiVariable myVariable) {
       final PsiElement scope = ((PsiParameter) myVariable).getDeclarationScope();
       if (scope instanceof PsiMethod) {
         final PsiMethod method = (PsiMethod) scope;
-        final PsiMethod psiMethod = SuperMethodWarningUtil.checkSuperMethod(method, RefactoringBundle.message("to.refactor"));
+        final PsiMethod psiMethod = SuperMethodWarningUtil.checkSuperMethod(method, RefactoringLocalize.toRefactor().get());
         if (psiMethod == null) {
           return true;
         }

diff --git a/...main/java/com/intellij/java/impl/codeInsight/highlighting/HighlightExitPointsHandler.java b/...main/java/com/intellij/java/impl/codeInsight/highlighting/HighlightExitPointsHandler.java
@@ -115,7 +115,6 @@ private static PsiElement getExitTarget(PsiStatement exitStatement) {
               break;
             }
           }
-
         }
         target = target.getParent();
       }
@@ -130,11 +129,22 @@ private static PsiElement getExitTarget(PsiStatement exitStatement) {
 
   private void highlightExitPoints(final PsiStatement parent, final PsiCodeBlock body) throws AnalysisCanceledException {
     final Project project = myTarget.getProject();
-    ControlFlow flow = ControlFlowFactory.getInstance(project).getControlFlow(body, LocalsOrMyInstanceFieldsControlFlowPolicy.getInstance(),
-        false);
-
-    Collection<PsiStatement> exitStatements = ControlFlowUtil.findExitPointsAndStatements(flow, 0, flow.getSize(), IntLists.newArrayList(),
-        PsiReturnStatement.class, PsiBreakStatement.class, PsiContinueStatement.class, PsiThrowStatement.class);
+    ControlFlow flow = ControlFlowFactory.getInstance(project).getControlFlow(
+      body,
+      LocalsOrMyInstanceFieldsControlFlowPolicy.getInstance(),
+      false
+    );
+
+    Collection<PsiStatement> exitStatements = ControlFlowUtil.findExitPointsAndStatements(
+      flow,
+      0,
+      flow.getSize(),
+      IntLists.newArrayList(),
+      PsiReturnStatement.class,
+      PsiBreakStatement.class,
+      PsiContinueStatement.class,
+      PsiThrowStatement.class
+    );
     if (!exitStatements.contains(parent)) {
       return;
     }

diff --git a/...va/com/intellij/java/impl/codeInsight/highlighting/HighlightExitPointsHandlerFactory.java b/...va/com/intellij/java/impl/codeInsight/highlighting/HighlightExitPointsHandlerFactory.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.java.impl.codeInsight.highlighting;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.highlight.usage.HighlightUsagesHandlerBase;
 import consulo.language.editor.highlight.usage.HighlightUsagesHandlerFactory;
@@ -30,13 +31,13 @@
 @ExtensionImpl
 public class HighlightExitPointsHandlerFactory implements HighlightUsagesHandlerFactory {
   @Override
+  @RequiredReadAction
   public HighlightUsagesHandlerBase createHighlightUsagesHandler(final Editor editor, final PsiFile file) {
     int offset = TargetElementUtil.adjustOffset(file, editor.getDocument(), editor.getCaretModel().getOffset());
     PsiElement target = file.findElementAt(offset);
-    if (target instanceof PsiKeyword) {
-      if (PsiKeyword.RETURN.equals(target.getText()) || PsiKeyword.THROW.equals(target.getText())) {
-        return new HighlightExitPointsHandler(editor, file, target);
-      }
+    if (target instanceof PsiKeyword
+      && (PsiKeyword.RETURN.equals(target.getText()) || PsiKeyword.THROW.equals(target.getText()))) {
+      return new HighlightExitPointsHandler(editor, file, target);
     }
     return null;
   }

diff --git a/...in/src/main/java/com/intellij/java/impl/codeInsight/intention/impl/CreateClassDialog.java b/...in/src/main/java/com/intellij/java/impl/codeInsight/intention/impl/CreateClassDialog.java
@@ -16,17 +16,17 @@
 package com.intellij.java.impl.codeInsight.intention.impl;
 
 import com.intellij.java.analysis.impl.codeInsight.daemon.impl.quickfix.ClassKind;
+import com.intellij.java.impl.codeInsight.PackageUtil;
 import com.intellij.java.impl.refactoring.MoveDestination;
 import com.intellij.java.impl.refactoring.PackageWrapper;
 import com.intellij.java.impl.refactoring.move.moveClassesOrPackages.DestinationFolderComboBox;
 import com.intellij.java.impl.refactoring.ui.PackageNameReferenceEditorCombo;
 import com.intellij.java.impl.refactoring.util.RefactoringMessageUtil;
 import com.intellij.java.impl.ui.ReferenceEditorComboWithBrowseButton;
-import com.intellij.java.impl.codeInsight.PackageUtil;
 import com.intellij.java.language.psi.PsiNameHelper;
 import consulo.application.util.function.Computable;
 import consulo.language.editor.localize.CodeInsightLocalize;
-import consulo.language.editor.refactoring.RefactoringBundle;
+import consulo.language.editor.refactoring.localize.RefactoringLocalize;
 import consulo.language.psi.PsiDirectory;
 import consulo.language.psi.PsiManager;
 import consulo.language.util.IncorrectOperationException;
@@ -196,7 +196,7 @@ public void actionPerformed(AnActionEvent e) {
     gbConstraints.insets.top = 12;
     gbConstraints.anchor = GridBagConstraints.WEST;
     gbConstraints.fill = GridBagConstraints.NONE;
-    final JBLabel label = new JBLabel(RefactoringBundle.message("target.destination.folder"));
+    final JBLabel label = new JBLabel(RefactoringLocalize.targetDestinationFolder().get());
     panel.add(label, gbConstraints);
 
     gbConstraints.gridy = 4;

diff --git a/...ava/com/intellij/java/impl/codeInspection/inferNullity/InferNullityAnnotationsAction.java b/...ava/com/intellij/java/impl/codeInspection/inferNullity/InferNullityAnnotationsAction.java
@@ -37,6 +37,7 @@
 import consulo.language.editor.FileModificationService;
 import consulo.language.editor.WriteCommandAction;
 import consulo.language.editor.refactoring.RefactoringBundle;
+import consulo.language.editor.refactoring.localize.RefactoringLocalize;
 import consulo.language.editor.scope.AnalysisScope;
 import consulo.language.editor.scope.localize.AnalysisScopeLocalize;
 import consulo.language.file.FileViewProvider;
@@ -305,7 +306,7 @@ private void showUsageView(@Nonnull Project project, final UsageInfo[] usageInfo
     presentation.setTabText("Infer Nullity Preview");
     presentation.setShowReadOnlyStatusAsRed(true);
     presentation.setShowCancelButton(true);
-    presentation.setUsagesString(RefactoringBundle.message("usageView.usagesText"));
+    presentation.setUsagesString(RefactoringLocalize.usageviewUsagestext().get());
 
     final UsageView usageView = UsageViewManager.getInstance(project).showUsages(targets, usages, presentation, rerunFactory(project, scope));
 

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,6 +15,7 @@
  */
 package com.intellij.java.impl.ig.classlayout;
 
+import consulo.language.editor.refactoring.localize.RefactoringLocalize;
 import jakarta.annotation.Nonnull;
 
 import consulo.annotation.component.ExtensionImpl;
@@ -129,10 +130,13 @@ public boolean process(PsiReference reference) {
           if (!JavaResolveUtil.isAccessible(member, member.getContainingClass(), modifierListCopy, element, null, null)) {
             final PsiElement context =
               PsiTreeUtil.getParentOfType(element, PsiMethod.class, PsiField.class, PsiClass.class, PsiFile.class);
-            conflicts.putValue(element, RefactoringBundle.message("0.with.1.visibility.is.not.accessible.from.2",
-                                                                  RefactoringUIUtil.getDescription(member, false),
-                                                                  PsiBundle.visibilityPresentation(PsiModifier.PRIVATE),
-                                                                  RefactoringUIUtil.getDescription(context, true)));
+            conflicts.putValue(
+              element,
+              RefactoringLocalize.zeroWith1VisibilityIsNotAccessibleFrom2(RefactoringUIUtil.getDescription(member, false),
+                PsiBundle.visibilityPresentation(PsiModifier.PRIVATE),
+                RefactoringUIUtil.getDescription(context, true)
+              ).get()
+            );
           }
           return true;
         }

diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/modifiers/ModifierIntention.java b/plugin/src/main/java/com/intellij/java/impl/ipp/modifiers/ModifierIntention.java
@@ -15,29 +15,32 @@
  */
 package com.intellij.java.impl.ipp.modifiers;
 
-import consulo.language.editor.intention.LowPriorityAction;
+import com.intellij.java.impl.ipp.base.Intention;
+import com.intellij.java.impl.ipp.base.PsiElementPredicate;
+import com.intellij.java.indexing.search.searches.OverridingMethodsSearch;
+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 com.siyeh.IntentionPowerPackBundle;
 import consulo.application.AccessToken;
 import consulo.application.WriteAction;
+import consulo.application.util.function.Processor;
+import consulo.application.util.query.Query;
 import consulo.ide.impl.idea.openapi.util.io.FileUtil;
-import consulo.language.psi.*;
-import com.intellij.java.language.impl.psi.impl.source.resolve.JavaResolveUtil;
-import com.intellij.java.indexing.search.searches.OverridingMethodsSearch;
-import consulo.language.psi.search.ReferencesSearch;
-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.intention.LowPriorityAction;
+import consulo.language.editor.refactoring.localize.RefactoringLocalize;
 import consulo.language.editor.refactoring.ui.ConflictsDialog;
-import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
 import consulo.language.editor.refactoring.ui.RefactoringUIUtil;
+import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
+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.application.util.function.Processor;
-import consulo.application.util.query.Query;
 import consulo.util.collection.MultiMap;
-import com.siyeh.IntentionPowerPackBundle;
-import com.intellij.java.impl.ipp.base.Intention;
-import com.intellij.java.impl.ipp.base.PsiElementPredicate;
 import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.MagicConstant;
 
@@ -160,10 +163,14 @@ public boolean process(PsiReference reference) {
         if (context == null) {
           return true;
         }
-        conflicts.putValue(element, RefactoringBundle.message("0.with.1.visibility.is.not.accessible.from.2",
-                                                              RefactoringUIUtil.getDescription(member, false),
-                                                              PsiBundle.visibilityPresentation(getModifier()),
-                                                              RefactoringUIUtil.getDescription(context, true)));
+        conflicts.putValue(
+          element,
+          RefactoringLocalize.zeroWith1VisibilityIsNotAccessibleFrom2(
+            RefactoringUIUtil.getDescription(member, false),
+            PsiBundle.visibilityPresentation(getModifier()),
+            RefactoringUIUtil.getDescription(context, true)
+          ).get()
+        );
         return true;
       }
     });

diff --git a/...main/java/com/intellij/java/impl/refactoring/anonymousToInner/AnonymousToInnerDialog.java b/...main/java/com/intellij/java/impl/refactoring/anonymousToInner/AnonymousToInnerDialog.java
@@ -25,7 +25,7 @@
 import com.intellij.java.language.psi.util.TypeConversionUtil;
 import consulo.application.HelpManager;
 import consulo.java.language.module.util.JavaClassNames;
-import consulo.language.editor.refactoring.RefactoringBundle;
+import consulo.language.editor.refactoring.localize.RefactoringLocalize;
 import consulo.language.editor.refactoring.ui.NameSuggestionsField;
 import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
 import consulo.language.psi.PsiElement;
@@ -37,8 +37,8 @@
 import consulo.ui.ex.awt.IdeBorderFactory;
 import consulo.ui.ex.awt.NonFocusableCheckBox;
 import consulo.util.lang.StringUtil;
-
 import jakarta.annotation.Nonnull;
+
 import javax.swing.*;
 import java.awt.*;
 import java.util.HashMap;
@@ -150,7 +150,7 @@ protected void doOKAction(){
     final String innerClassName = getClassName();
     final PsiManager manager = PsiManager.getInstance(myProject);
     if ("".equals(innerClassName)) {
-      errorString = RefactoringBundle.message("anonymousToInner.no.inner.class.name");
+      errorString = RefactoringLocalize.anonymoustoinnerNoInnerClassName().get();
     }
     else {
       if (!PsiNameHelper.getInstance(manager.getProject()).isIdentifier(innerClassName)) {
@@ -163,7 +163,7 @@ protected void doOKAction(){
           PsiClass[] innerClasses = targetClass.getInnerClasses();
           for (PsiClass innerClass : innerClasses) {
             if (innerClassName.equals(innerClass.getName())) {
-              errorString = RefactoringBundle.message("inner.class.exists", innerClassName, targetClass.getName());
+              errorString = RefactoringLocalize.innerClassExists(innerClassName, targetClass.getName()).get();
               break;
             }
           }
@@ -191,10 +191,10 @@ protected JComponent createNorthPanel() {
     myNameField = new NameSuggestionsField(myProject);
 
     FormBuilder formBuilder = FormBuilder.createFormBuilder()
-      .addLabeledComponent(RefactoringBundle.message("anonymousToInner.class.name.label.text"), myNameField);
+      .addLabeledComponent(RefactoringLocalize.anonymoustoinnerClassNameLabelText().get(), myNameField);
 
     if(!myShowCanBeStatic) {
-      myCbMakeStatic = new NonFocusableCheckBox(RefactoringBundle.message("anonymousToInner.make.class.static.checkbox.text"));
+      myCbMakeStatic = new NonFocusableCheckBox(RefactoringLocalize.anonymoustoinnerMakeClassStaticCheckboxText().get());
       myCbMakeStatic.setSelected(true);
       formBuilder.addComponent(myCbMakeStatic);
     }
@@ -216,7 +216,7 @@ protected void doCancelAction() {
       }
     };
     panel.setBorder(IdeBorderFactory.createTitledBorder(
-      RefactoringBundle.message("anonymousToInner.parameters.panel.border.title"), false));
+      RefactoringLocalize.anonymoustoinnerParametersPanelBorderTitle().get(), false));
     return panel;
   }
 

diff --git a/...ain/java/com/intellij/java/impl/refactoring/anonymousToInner/AnonymousToInnerHandler.java b/...ain/java/com/intellij/java/impl/refactoring/anonymousToInner/AnonymousToInnerHandler.java
@@ -30,6 +30,7 @@
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.editor.refactoring.RefactoringBundle;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
+import consulo.language.editor.refactoring.localize.RefactoringLocalize;
 import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
@@ -39,6 +40,7 @@
 import consulo.language.psi.search.ReferencesSearch;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.logging.Logger;
 import consulo.project.Project;
 import consulo.ui.annotation.RequiredUIAccess;
@@ -80,7 +82,7 @@ public void invoke(@Nonnull final Project project, Editor editor, final PsiFile
     editor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE);
     final PsiAnonymousClass anonymousClass = findAnonymousClass(file, offset);
     if (anonymousClass == null) {
-      showErrorMessage(editor, RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("error.wrong.caret.position.anonymous")));
+      showErrorMessage(editor, RefactoringBundle.getCannotRefactorMessage(RefactoringLocalize.errorWrongCaretPositionAnonymous().get()));
       return;
     }
     final PsiElement parent = anonymousClass.getParent();
@@ -104,8 +106,8 @@ public void invoke(final Project project, Editor editor, final PsiAnonymousClass
     PsiClassType baseRef = myAnonClass.getBaseClassType();
 
     if (baseRef.resolve() == null) {
-      String message = RefactoringBundle.message("error.cannot.resolve", baseRef.getCanonicalText());
-      showErrorMessage(editor, message);
+      LocalizeValue message = RefactoringLocalize.errorCannotResolve(baseRef.getCanonicalText());
+      showErrorMessage(editor, message.get());
       return;
     }
     PsiElement targetContainer = findTargetContainer(myAnonClass);