From 913875a4428ea649c54fa2f735282561ef19fab2 Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Fri, 24 Apr 2020 15:52:57 +0300
Subject: [PATCH] [vcs-log] install already loaded highlighters

follow-up: c98fd042cfacf7ebfd0a438485eb5a3cc5a2d4d5

GitOrigin-RevId: 873b8373c27c64aa1315943b818fa9e878d816f6
---
 .../intellij/vcs/log/util/VcsLogUiUtil.java    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/util/VcsLogUiUtil.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/util/VcsLogUiUtil.java
index cfd0bab40ebe..772381b229c0 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/util/VcsLogUiUtil.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/util/VcsLogUiUtil.java
@@ -8,7 +8,6 @@ import com.intellij.ide.IdeTooltip;
 import com.intellij.ide.IdeTooltipManager;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.progress.util.ProgressWindow;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.Balloon;
 import com.intellij.openapi.util.ActionCallback;
 import com.intellij.openapi.util.Disposer;
@@ -186,13 +185,18 @@ public class VcsLogUiUtil {
 
   public static void installHighlighters(@NotNull AbstractVcsLogUi logUi, @NotNull Predicate<? super VcsLogHighlighterFactory> enabled) {
     LOG_HIGHLIGHTER_FACTORY_EP.addChangeListener(() -> {
-      logUi.getTable().removeAllHighlighters();
-      for (VcsLogHighlighterFactory factory : LOG_HIGHLIGHTER_FACTORY_EP.getExtensionList()) {
-        if (enabled.test(factory)) {
-          logUi.getTable().addHighlighter(factory.createHighlighter(logUi.getLogData(), logUi));
-        }
-      }
+      updateHighlighters(logUi, enabled);
     }, logUi);
+    updateHighlighters(logUi, enabled);
+  }
+
+  private static void updateHighlighters(@NotNull AbstractVcsLogUi logUi, @NotNull Predicate<? super VcsLogHighlighterFactory> enabled) {
+    logUi.getTable().removeAllHighlighters();
+    for (VcsLogHighlighterFactory factory : LOG_HIGHLIGHTER_FACTORY_EP.getExtensionList()) {
+      if (enabled.test(factory)) {
+        logUi.getTable().addHighlighter(factory.createHighlighter(logUi.getLogData(), logUi));
+      }
+    }
   }
 
   private static class VcsLogPlaceNavigator implements Place.Navigator {