@@ -49,10 +49,11 @@ final class FormatterProvider {
     private final LoadingCache<FormatterCacheKey, Optional<FormatterService>> implementationCache =
             Caffeine.newBuilder().maximumSize(1).build(FormatterProvider::createFormatter);
 
-    @SuppressWarnings("for-rollout:deprecation")
     static IdeaPluginDescriptor getPluginDescriptor() {
         return Preconditions.checkNotNull(
-                PluginManager.getPlugin(PluginId.getId(PLUGIN_ID)), "Couldn't find our own plugin: %s", PLUGIN_ID);
+                PluginManager.getInstance().findEnabledPlugin(PluginId.getId(PLUGIN_ID)),
+                "Couldn't find our own plugin: %s",
+                PLUGIN_ID);
     }
 
     Optional<FormatterService> get(Project project, PalantirJavaFormatSettings settings) {
@@ -89,8 +90,7 @@ private static List<Path> getProvidedImplementationUrls(List<URI> implementation
     private static List<Path> getBundledImplementationUrls() {
         // Load from the jars bundled with the plugin.
         IdeaPluginDescriptor ourPlugin = getPluginDescriptor();
-        @SuppressWarnings("for-rollout:deprecation")
-        Path implDir = ourPlugin.getPath().toPath().resolve("impl");
+        Path implDir = ourPlugin.getPluginPath().resolve("impl");
         log.debug("Using open-java-format implementation bundled with plugin: {}", implDir);
         return listDirAsUrlsUnchecked(implDir);
     }
 
@@ -47,6 +47,9 @@ class PalantirJavaFormatFormattingService extends AsyncDocumentFormattingService
     @Override
     protected FormattingTask createFormattingTask(@NotNull AsyncFormattingRequest request) {
         Project project = request.getContext().getProject();
+        // The marketplace verifier reports this class as experimental, and newer IDEs also deprecate it. It stays:
+        // its replacement, com.intellij.ide.trustedProjects.TrustedProjects, is @ApiStatus.Internal — a worse thing
+        // for a plugin to call.
         if (!TrustedProjects.isTrusted(project)) {
             logger.warn("open-java-format: skipping formatting for untrusted project: " + project.getName());
             request.onError(