Replacing EP_NAME with getExtensionPoint (part 4).

Author: unv-unv

java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/UnusedSymbolUtil.java

@@ -23,6 +23,7 @@
 import com.intellij.java.language.impl.psi.impl.source.PsiClassImpl;
 import com.intellij.java.language.psi.*;
 import com.intellij.java.language.psi.util.PropertyUtil;
+import consulo.annotation.DeprecationInfo;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.application.progress.ProgressIndicator;
 import consulo.application.progress.ProgressManager;
@@ -40,6 +41,7 @@
 import consulo.language.psi.resolve.RefResolveService;
 import consulo.language.psi.scope.GlobalSearchScope;
 import consulo.language.psi.search.PsiSearchHelper;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.usage.UsageInfo;
 import jakarta.annotation.Nonnull;
@@ -87,28 +89,37 @@ public static boolean isImplicitWrite(@Nonnull Project project, @Nonnull PsiVari
         }) || isInjected(project, element);
     }
 
-    @Nullable
+    @Nonnull
     @RequiredReadAction
-    public static HighlightInfo createUnusedSymbolInfo(
+    public static HighlightInfo.Builder createUnusedSymbolInfo(
         @Nonnull PsiElement element,
-        @Nonnull String message,
+        @Nonnull LocalizeValue message,
         @Nonnull HighlightInfoType highlightInfoType
     ) {
-        HighlightInfo info = HighlightInfo.newHighlightInfo(highlightInfoType)
+        HighlightInfo.Builder hlBuilder = HighlightInfo.newHighlightInfo(highlightInfoType)
             .range(element)
-            .descriptionAndTooltip(message).create();
-
-        if (info == null) {
-            return null; //filtered out
-        }
+            .descriptionAndTooltip(message);
 
-        for (UnusedDeclarationFixProvider provider : UnusedDeclarationFixProvider.EP_NAME.getExtensionList()) {
+        element.getApplication().getExtensionPoint(UnusedDeclarationFixProvider.class).forEach(provider -> {
             IntentionAction[] fixes = provider.getQuickFixes(element);
             for (IntentionAction fix : fixes) {
-                info.registerFix(fix, null, null, null, null);
+                hlBuilder.registerFix(fix);
             }
-        }
-        return info;
+        });
+
+        return hlBuilder;
+    }
+
+    @Deprecated
+    @DeprecationInfo("Use variant with LocalizeValue")
+    @Nullable
+    @RequiredReadAction
+    public static HighlightInfo createUnusedSymbolInfo(
+        @Nonnull PsiElement element,
+        @Nonnull String message,
+        @Nonnull HighlightInfoType highlightInfoType
+    ) {
+        return createUnusedSymbolInfo(element, LocalizeValue.of(message), highlightInfoType).create();
     }
 
     @RequiredReadAction

plugin/src/main/java/com/intellij/java/impl/ig/performance/ClassInitializerMayBeStaticInspection.java

@@ -26,8 +26,9 @@
 import com.siyeh.ig.psiutils.ClassUtils;
 import com.siyeh.localize.InspectionGadgetsLocalize;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.application.Application;
+import consulo.component.extension.ExtensionPoint;
 import consulo.java.analysis.codeInspection.CantBeStaticCondition;
-import consulo.java.analysis.codeInspection.JavaExtensionPoints;
 import consulo.language.psi.PsiElement;
 import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.Nls;
@@ -76,11 +77,11 @@ public void visitClassInitializer(PsiClassInitializer initializer) {
             if (containingClass == null) {
                 return;
             }
-            for (CantBeStaticCondition addin : JavaExtensionPoints.CANT_BE_STATIC_EP_NAME.getExtensions()) {
-                if (addin.cantBeStatic(initializer)) {
-                    return;
-                }
+            ExtensionPoint<CantBeStaticCondition> cantBeStaticEP = Application.get().getExtensionPoint(CantBeStaticCondition.class);
+            if (cantBeStaticEP.anyMatchSafe(addin -> addin.cantBeStatic(initializer))) {
+                return;
             }
+
             PsiElement scope = containingClass.getScope();
             if (!(scope instanceof PsiJavaFile) && !containingClass.isStatic()) {
                 return;

plugin/src/main/java/com/intellij/java/impl/ig/performance/MethodMayBeStaticInspection.java

@@ -27,9 +27,9 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.application.util.query.Query;
+import consulo.component.extension.ExtensionPoint;
 import consulo.deadCodeNotWorking.impl.MultipleCheckboxOptionsPanel;
 import consulo.java.analysis.codeInspection.CantBeStaticCondition;
-import consulo.java.analysis.codeInspection.JavaExtensionPoints;
 import consulo.language.psi.PsiElement;
 import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
@@ -98,10 +98,9 @@ public void visitMethod(@Nonnull PsiMethod method) {
             if (containingClass == null) {
                 return;
             }
-            for (CantBeStaticCondition addin : JavaExtensionPoints.CANT_BE_STATIC_EP_NAME.getExtensions()) {
-                if (addin.cantBeStatic(method)) {
-                    return;
-                }
+            ExtensionPoint<CantBeStaticCondition> cantBeStaticEP = method.getApplication().getExtensionPoint(CantBeStaticCondition.class);
+            if (cantBeStaticEP.anyMatchSafe(addin -> addin.cantBeStatic(method))) {
+                return;
             }
             PsiElement scope = containingClass.getScope();
             if (!(scope instanceof PsiJavaFile) && !containingClass.isStatic()) {