Make it safer

Author: abashev

open-java-format-idea-plugin/src/main/java/com/palantir/javaformat/intellij/FormatterProvider.java

@@ -18,13 +18,15 @@
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
-import com.intellij.formatting.service.FormattingService;
 import com.intellij.openapi.extensions.PluginDescriptor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.SystemInfo;
 import com.palantir.javaformat.bootstrap.BootstrappingFormatterService;
 import com.palantir.javaformat.bootstrap.NativeImageFormatterService;
 import com.palantir.javaformat.java.FormatterService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URI;
@@ -35,8 +37,9 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import static com.intellij.formatting.service.FormattingService.EP_NAME;
+import static java.util.Optional.ofNullable;
 
 final class FormatterProvider {
     private static final Logger log = LoggerFactory.getLogger(FormatterProvider.class);
@@ -51,10 +54,9 @@ final class FormatterProvider {
      * extension point finds the service by class. Every way of looking a plugin up by id or by class became
      * {@code @ApiStatus.Internal} in 2026.2; PluginAware and the extension point are public API in every supported IDE.
      */
-    static PluginDescriptor getPluginDescriptor() {
-        return FormattingService.EP_NAME
-                .findExtensionOrFail(PalantirJavaFormatFormattingService.class)
-                .getPluginDescriptor();
+    static Optional<PluginDescriptor> getPluginDescriptor() {
+        return ofNullable(EP_NAME.findExtension(PalantirJavaFormatFormattingService.class))
+                .map(PalantirJavaFormatFormattingService::getPluginDescriptor);
     }
 
     Optional<FormatterService> get(Project project, PalantirJavaFormatSettings settings) {
@@ -90,9 +92,10 @@ private static List<Path> getProvidedImplementationUrls(List<URI> implementation
     @SuppressWarnings("for-rollout:Slf4jLogsafeArgs")
     private static List<Path> getBundledImplementationUrls() {
         // Load from the jars bundled with the plugin.
-        PluginDescriptor ourPlugin = getPluginDescriptor();
-        Path implDir = ourPlugin.getPluginPath().resolve("impl");
+        Path implDir = getPluginDescriptor().map(PluginDescriptor::getPluginPath).orElseThrow().resolve("impl");
+
         log.debug("Using open-java-format implementation bundled with plugin: {}", implDir);
+
         return listDirAsUrlsUnchecked(implDir);
     }
 

open-java-format-idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirJavaFormatSettings.java

@@ -19,9 +19,12 @@
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
+import com.intellij.openapi.extensions.PluginDescriptor;
 import com.intellij.openapi.project.Project;
 import com.palantir.javaformat.java.FormatterService;
 import com.palantir.javaformat.java.JavaFormatterOptions;
+
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URI;
@@ -30,7 +33,8 @@
 import java.util.jar.JarFile;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.annotation.Nullable;
+
+import static com.palantir.javaformat.intellij.FormatterProvider.getPluginDescriptor;
 
 @SuppressWarnings("for-rollout:SameNameButDifferent")
 @State(
@@ -109,7 +113,7 @@ boolean injectedVersionIsOutdated() {
     }
 
     Optional<String> getImplementationVersion() {
-        return Optional.ofNullable(FormatterProvider.getPluginDescriptor().getVersion());
+        return getPluginDescriptor().map(PluginDescriptor::getVersion);
     }
 
     Optional<String> computeFormatterVersion() {

open-java-format-idea-plugin/src/test/java/com/palantir/javaformat/intellij/PalantirJavaFormatFormattingServiceTest.java

@@ -16,8 +16,6 @@
 
 package com.palantir.javaformat.intellij;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import com.google.common.collect.ImmutableList;
 import com.intellij.codeInsight.actions.ReformatCodeProcessor;
 import com.intellij.formatting.service.AsyncFormattingRequest;
@@ -39,16 +37,20 @@
 import com.intellij.testFramework.fixtures.JavaTestFixtureFactory;
 import com.intellij.testFramework.fixtures.TestFixtureBuilder;
 import com.palantir.javaformat.intellij.PalantirJavaFormatSettings.State;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+
+import static com.palantir.javaformat.intellij.FormatterProvider.getPluginDescriptor;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class PalantirJavaFormatFormattingServiceTest {
     private JavaCodeInsightTestFixture fixture;
@@ -65,7 +67,7 @@ public void setUp() throws Exception {
         delegatingFormatter = new DelegatingFormatter();
         // Only the service the platform creates from plugin.xml is handed the plugin descriptor. This one is created
         // here, so it takes the descriptor from that service before masking it.
-        delegatingFormatter.setPluginDescriptor(FormatterProvider.getPluginDescriptor());
+        delegatingFormatter.setPluginDescriptor(getPluginDescriptor().orElseThrow());
         ExtensionTestUtil.maskExtensions(
                 FormattingService.EP_NAME, ImmutableList.of(delegatingFormatter), fixture.getProjectDisposable());