MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java, highlighting] update utility class IJ-CR-121658

Browse Source 
GitOrigin-RevId: d87df85b58fe4eae5f5c80fa7a3625d856d53dc9
This commit is contained in:
Aleksey Dobrynin
2023-12-06 11:21:29 +01:00
committed by intellij-monorepo-bot
parent 131bfc4609
commit f1bd0d54d2
5 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/JavaServiceUtil.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInsight.daemon.impl;
import com.intellij.codeInsight.daemon.GutterIconNavigationHandler;
@@ -28,6 +28,9 @@ import java.util.*;
import static com.intellij.psi.CommonClassNames.JAVA_UTIL_SERVICE_LOADER;
/**
* Utility for working with Java services (jigsaw)
*/
final public class JavaServiceUtil {
public static final String PROVIDER = "provider";
public static final Set<String> JAVA_UTIL_SERVICE_LOADER_METHODS = Set.of("load", "loadInstalled");
@@ -35,6 +38,12 @@ final public class JavaServiceUtil {
static final CallMatcher SERVICE_LOADER_LOAD = CallMatcher.staticCall(JAVA_UTIL_SERVICE_LOADER,
ArrayUtil.toStringArray(JAVA_UTIL_SERVICE_LOADER_METHODS));
/**
* Checks if the given method is a service provider method.
*
* @param method for checking
* @return true if the method is a service provider method, false otherwise
*/
public static boolean isServiceProviderMethod(@NotNull PsiMethod method) {
return PROVIDER.equals(method.getName()) &&
method.getParameterList().isEmpty() &&
@@ -42,8 +51,14 @@ final public class JavaServiceUtil {
method.hasModifierProperty(PsiModifier.STATIC);
}
/**
* Finds a service provider method within a given PsiClass.
*
* @param psiClass to search for the service provider method
* @return service provider method, or null if not found
*/
@Nullable
public static PsiMethod findProvider(@NotNull PsiClass psiClass) {
public static PsiMethod findServiceProviderMethod(@NotNull PsiClass psiClass) {
return ContainerUtil.find(psiClass.findMethodsByName("provider", false), JavaServiceUtil::isServiceProviderMethod);
}
@@ -56,7 +71,7 @@ final public class JavaServiceUtil {
@NotNull
static List<LineMarkerInfo<PsiElement>> collectServiceImplementationClass(@NotNull PsiClass psiClass) {
if (findProvider(psiClass) != null) return Collections.emptyList();
if (findServiceProviderMethod(psiClass) != null) return Collections.emptyList();
for (PsiMethod constructor : psiClass.getConstructors()) {
if (!constructor.hasParameters()) return createJavaServiceLineMarkerInfo(constructor.getNameIdentifier(), psiClass, psiClass);
}
@@ -84,7 +99,7 @@ final public class JavaServiceUtil {
PsiClassType[] implementationTypes = implementationList.getReferencedTypes();
for (PsiClassType implementationType : implementationTypes) {
if (!Objects.equals(implementerClass, implementationType.resolve())) continue;
if (!implementerClass.equals(implementationType.resolve())) continue;
PsiClass interfaceClass = interfaceType.resolve();
if (!InheritanceUtil.isInheritorOrSelf(resultClass, interfaceClass, true)) continue;
String interfaceClassName = interfaceClass.getQualifiedName();

2
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/ModuleHighlightUtil.java
View File

@@ -388,7 +388,7 @@ final class ModuleHighlightUtil {
errorSink.accept(info);
}
PsiMethod provider = JavaServiceUtil.findProvider(implClass);
PsiMethod provider = JavaServiceUtil.findServiceProviderMethod(implClass);
if (provider != null) {
PsiType type = provider.getReturnType();
PsiClass typeClass = type instanceof PsiClassType ? ((PsiClassType)type).resolve() : null;

2
java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaModuleImpl.java
View File

@@ -143,7 +143,7 @@ public final class RefJavaModuleImpl extends RefElementImpl implements RefJavaMo
final PsiElement implementationClass = implementationReference.resolve();
if (implementationClass instanceof PsiClass psiClass) {
RefElement refTargetElement = null;
PsiElement targetElement = JavaServiceUtil.findProvider(psiClass);
PsiElement targetElement = JavaServiceUtil.findServiceProviderMethod(psiClass);
if (targetElement == null) {
final RefElement refElement = getRefManager().getReference(psiClass);