From e4f97eea12402e7f7ee8c3da0b1bd9f24a95ac7e Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Sun, 10 May 2020 02:19:11 +0300
Subject: [PATCH] [vcs-log] plugin listener to dispose and create log on plugin
 changes

This allows to recreate log once when a plugin is loaded or unloaded, rather than doing it for every extension point. This also gives disposing process a better chance to be finished before classloader checks, as it asynchronous.

GitOrigin-RevId: 549b6a9b60607383543f3c46234812faf8c3c7a8
---
 .../intellij/vcs/log/impl/VcsProjectLog.java  | 56 +++++++++++++++++--
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsProjectLog.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsProjectLog.java
index c3daf1914400..d6cfc4d40e22 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsProjectLog.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsProjectLog.java
@@ -2,12 +2,15 @@
 package com.intellij.vcs.log.impl;
 
 import com.intellij.ide.caches.CachesInvalidator;
+import com.intellij.ide.plugins.DynamicPluginListener;
+import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ApplicationNamesInfo;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
@@ -24,6 +27,7 @@ import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.concurrency.AppExecutorUtil;
 import com.intellij.util.messages.MessageBus;
+import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.messages.Topic;
 import com.intellij.vcs.log.VcsLogBundle;
 import com.intellij.vcs.log.VcsLogFilterCollection;
@@ -35,7 +39,9 @@ import com.intellij.vcs.log.util.VcsLogUtil;
 import org.jetbrains.annotations.*;
 
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.*;
 import java.util.function.BiConsumer;
 
@@ -88,10 +94,10 @@ public class VcsProjectLog implements Disposable {
     });
   }
 
-  private void subscribeToMappingsAndEPsChanges() {
-    myMessageBus.connect(myListenersDisposable).subscribe(ProjectLevelVcsManager.VCS_CONFIGURATION_CHANGED, () -> disposeLog(true));
-    LOG_PROVIDER_EP.getPoint(myProject).addChangeListener(() -> disposeLog(true), myListenersDisposable);
-    LOG_CUSTOM_UI_FACTORY_PROVIDER_EP.addChangeListener(myProject, () -> disposeLog(true), myListenersDisposable);
+  private void subscribeToMappingsAndPluginsChanges() {
+    MessageBusConnection connection = myMessageBus.connect(myListenersDisposable);
+    connection.subscribe(ProjectLevelVcsManager.VCS_CONFIGURATION_CHANGED, () -> disposeLog(true));
+    connection.subscribe(DynamicPluginListener.TOPIC, new MyDynamicPluginUnloader());
   }
 
   @Nullable
@@ -348,11 +354,51 @@ public class VcsProjectLog implements Disposable {
 
       VcsProjectLog projectLog = getInstance(project);
 
-      projectLog.subscribeToMappingsAndEPsChanges();
+      projectLog.subscribeToMappingsAndPluginsChanges();
       projectLog.createLogInBackground(false);
     }
   }
 
+  private class MyDynamicPluginUnloader implements DynamicPluginListener {
+    private final Set<PluginId> affectedPlugins = new HashSet<>();
+
+    @Override
+    public void pluginLoaded(@NotNull IdeaPluginDescriptor pluginDescriptor) {
+      if (hasLogExtensions(pluginDescriptor)) {
+        disposeLog(true);
+      }
+    }
+
+    @Override
+    public void beforePluginUnload(@NotNull IdeaPluginDescriptor pluginDescriptor, boolean isUpdate) {
+      if (hasLogExtensions(pluginDescriptor)) {
+        affectedPlugins.add(pluginDescriptor.getPluginId());
+        LOG.debug("Disposing Vcs Log before unloading " + pluginDescriptor.getPluginId());
+        disposeLog(false);
+      }
+    }
+
+    @Override
+    public void pluginUnloaded(@NotNull IdeaPluginDescriptor pluginDescriptor, boolean isUpdate) {
+      if (affectedPlugins.remove(pluginDescriptor.getPluginId())) {
+        LOG.debug("Recreating Vcs Log after unloading " + pluginDescriptor.getPluginId());
+        // createLog calls between beforePluginUnload and pluginUnloaded are technically not prohibited
+        // so just in case, recreating log here
+        disposeLog(true);
+      }
+    }
+
+    private boolean hasLogExtensions(@NotNull IdeaPluginDescriptor descriptor) {
+      for (VcsLogProvider logProvider : LOG_PROVIDER_EP.getExtensions(myProject)) {
+        if (logProvider.getClass().getClassLoader() == descriptor.getPluginClassLoader()) return true;
+      }
+      for (CustomVcsLogUiFactoryProvider factory : LOG_CUSTOM_UI_FACTORY_PROVIDER_EP.getExtensions(myProject)) {
+        if (factory.getClass().getClassLoader() == descriptor.getPluginClassLoader()) return true;
+      }
+      return false;
+    }
+  }
+
   public interface ProjectLogListener {
     @CalledInAwt
     void logCreated(@NotNull VcsLogManager manager);