Fixed bug where GitRepositoryManager is null when trying to update th…

…e tool window after initializing git in a project
vovak · Jul 30, 2020 · c24236b · c24236b
1 parent cb16720
commit c24236b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 20 deletions.
diff --git a/.../java/org/ualberta/smr/explainmergeconflict/actions/ShowExplanationsToolWindowAction.java b/.../java/org/ualberta/smr/explainmergeconflict/actions/ShowExplanationsToolWindowAction.java
@@ -3,7 +3,6 @@
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.ui.components.JBLabel;
@@ -19,15 +18,10 @@
 public class ShowExplanationsToolWindowAction extends AnAction {
     @Override
     public void update(AnActionEvent e) {
-        Project project = e.getProject();
-        if (e.getProject() != null) {
-            GitRepository repo = Utils.getCurrentRepository(project);
-            boolean isInGit = Utils.isInGitRepository(project);
-            boolean isInConflict = Utils.isInConflictState(repo);
-            boolean shouldActionBeVisible = isInGit && isInConflict;
-            e.getPresentation().setVisible(shouldActionBeVisible);
+        GitRepository repo = Utils.getCurrentRepository(e.getProject());
+        e.getPresentation().setVisible(repo != null && Utils.isInConflictState(repo));
+
 //            System.out.println(e.getDataContext());
-        }
     }
 
     @Override

diff --git a/src/main/java/org/ualberta/smr/explainmergeconflict/services/UIController.java b/src/main/java/org/ualberta/smr/explainmergeconflict/services/UIController.java
@@ -32,7 +32,10 @@ public static void updateToolWindowAfterAction(GitRepository repo) {
 
     public static void updateToolWindowAfterNonConflictState(GitRepository repo) {
         assert !Utils.isInConflictState(repo);
-        if (manager.getToolWindow(
+        // If manager is null, this means that the update function for non
+        // conflict state was called outside of a context menu action.
+        // Ex. initializing git for a project.
+        if (manager != null && manager.getToolWindow(
                 ExplainMergeConflictBundle.message("toolwindow.id")) != null) {
             unregisterToolWindow();
         }

diff --git a/src/main/java/org/ualberta/smr/explainmergeconflict/ui/ExplanationsToolWindow.java b/src/main/java/org/ualberta/smr/explainmergeconflict/ui/ExplanationsToolWindow.java
@@ -6,10 +6,6 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.wm.ToolWindow;
-import com.intellij.openapi.wm.ToolWindowAnchor;
-import com.intellij.openapi.wm.ToolWindowManager;
-import com.sun.istack.NotNull;
-import git4idea.repo.GitConflictsHolder;
 import git4idea.repo.GitRepository;
 import org.ualberta.smr.explainmergeconflict.utils.Utils;
 
@@ -41,8 +37,6 @@ public ExplanationsToolWindow(GitRepository repo,
     }
 
     private void initializeToolWindow() {
-        // FIXME - do not initialize plugin if no repo or no file upon
-        //  initialization
         updateUIIfMergeConflictState();
 //        updateBackgroundColors();
 

diff --git a/src/main/java/org/ualberta/smr/explainmergeconflict/utils/Utils.java b/src/main/java/org/ualberta/smr/explainmergeconflict/utils/Utils.java
@@ -40,10 +40,9 @@ public static boolean isInGitRepository(Project project) {
      * @return current repository
      */
     public static GitRepository getCurrentRepository(Project project) {
-        // FIXME run this assertion in another function
-        assert !GitRepositoryManager.getInstance(project)
-                .getRepositories()
-                .isEmpty();
+        if (!isInGitRepository(project)) {
+            return null;
+        }
         return GitRepositoryManager.getInstance(project)
                 .getRepositories()
                 .get(0);