[lombok] Simplify check of Lombok presense on project opening via has…

…LibraryJar check instead of findClass GitOrigin-RevId: cbc358ba74a4740ebbfaeaea89d32d57f5ac969f
JetBrains · Jun 6, 2023 · dc4b99d · dc4b99d
1 parent 7062c04
commit dc4b99d
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/util/LombokLibraryUtil.java b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/util/LombokLibraryUtil.java
@@ -1,5 +1,6 @@
 package de.plushnikov.intellij.plugin.util;
 
+import com.intellij.java.library.JavaLibraryUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ReadAction;
 import com.intellij.openapi.diagnostic.Logger;
@@ -11,7 +12,7 @@
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiPackage;
-import com.intellij.psi.util.CachedValueProvider;
+import com.intellij.psi.util.CachedValueProvider.Result;
 import com.intellij.psi.util.CachedValuesManager;
 import de.plushnikov.intellij.plugin.Version;
 import org.jetbrains.annotations.NotNull;
@@ -21,23 +22,17 @@
 
 public final class LombokLibraryUtil {
 
- private static final Logger LOG = Logger.getInstance(LombokLibraryUtil.class);
-
  private static final String LOMBOK_PACKAGE = "lombok.experimental";
 
  public static boolean hasLombokLibrary(@NotNull Project project) {
  if (project.isDefault() || !project.isInitialized()) {
  return false;
  }
  ApplicationManager.getApplication().assertReadAccessAllowed();
- return CachedValuesManager.getManager(project).getCachedValue(project, () -> {
- PsiPackage aPackage = JavaPsiFacade.getInstance(project).findPackage(LOMBOK_PACKAGE);
- return new CachedValueProvider.Result<>(aPackage, ProjectRootManager.getInstance(project));
- }) != null;
+ return JavaLibraryUtil.hasLibraryJar(project, "org.projectlombok:lombok");
  }
 
- @NotNull
- public static String getLombokVersionCached(@NotNull Project project) {
+ public static @NotNull String getLombokVersionCached(@NotNull Project project) {
  return CachedValuesManager.getManager(project).getCachedValue(project, () -> {
  String lombokVersion = null;
  try {
@@ -47,14 +42,13 @@ public static String getLombokVersionCached(@NotNull Project project) {
  throw e;
  }
  catch (Throwable e) {
- LOG.error(e);
+ Logger.getInstance(LombokLibraryUtil.class).error(e);
  }
- return new CachedValueProvider.Result<>(StringUtil.notNullize(lombokVersion), ProjectRootManager.getInstance(project));
+ return new Result<>(StringUtil.notNullize(lombokVersion), ProjectRootManager.getInstance(project));
  });
  }
 
- @Nullable
- private static String getLombokVersionInternal(@NotNull Project project) {
+ private static @Nullable String getLombokVersionInternal(@NotNull Project project) {
  PsiPackage aPackage = JavaPsiFacade.getInstance(project).findPackage(LOMBOK_PACKAGE);
  if (aPackage != null) {
  PsiDirectory[] directories = aPackage.getDirectories();