Fix pluginVersion discovery (#1247)

Fix pluginVersion discovery

Author: crogoz

changelog/@unreleased/pr-1247.v2.yml

@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Fix pluginVersion discovery
+  links:
+  - https://github.com/palantir/palantir-java-format/pull/1247

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

@@ -54,12 +54,17 @@
 final class FormatterProvider {
     private static final Logger log = LoggerFactory.getLogger(FormatterProvider.class);
 
-    private static final String PLUGIN_ID = "palantir-java-format";
+    static final String PLUGIN_ID = "palantir-java-format";
 
     // Cache to avoid creating a URLClassloader every time we want to format from IntelliJ
     private final LoadingCache<FormatterCacheKey, Optional<FormatterService>> implementationCache =
             Caffeine.newBuilder().maximumSize(1).build(FormatterProvider::createFormatter);
 
+    static IdeaPluginDescriptor getPluginDescriptor() {
+        return Preconditions.checkNotNull(
+                PluginManager.getPlugin(PluginId.getId(PLUGIN_ID)), "Couldn't find our own plugin: %s", PLUGIN_ID);
+    }
+
     Optional<FormatterService> get(Project project, PalantirJavaFormatSettings settings) {
         return implementationCache.get(new FormatterCacheKey(
                 project,
@@ -117,8 +122,7 @@ 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.
-        IdeaPluginDescriptor ourPlugin = Preconditions.checkNotNull(
-                PluginManager.getPlugin(PluginId.getId(PLUGIN_ID)), "Couldn't find our own plugin: %s", PLUGIN_ID);
+        IdeaPluginDescriptor ourPlugin = getPluginDescriptor();
         Path implDir = ourPlugin.getPath().toPath().resolve("impl");
         log.debug("Using palantir-java-format implementation bundled with plugin: {}", implDir);
         return listDirAsUrlsUnchecked(implDir);

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

@@ -16,7 +16,6 @@
 
 package com.palantir.javaformat.intellij;
 
-import com.google.common.base.Strings;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.components.State;
@@ -112,8 +111,7 @@ boolean injectedVersionIsOutdated() {
     }
 
     Optional<String> getImplementationVersion() {
-        return Optional.ofNullable(Strings.emptyToNull(
-                PalantirJavaFormatConfigurable.class.getPackage().getImplementationVersion()));
+        return Optional.ofNullable(FormatterProvider.getPluginDescriptor().getVersion());
     }
 
     Optional<String> computeFormatterVersion() {