fix task onSuccess vs modal dialog issue

Author: chuntungho

gradle.properties

@@ -1,5 +1,5 @@
 version = 1.0.0
-ideaVersion = IC-2019.3
+ideaVersion = IC-2019.1
 customUtilBuild = 194.*
 isEAP = false
 pluginChannels = nightly

src/main/java/com/chuntung/plugin/gistsnippet/action/InsertAction.java

@@ -13,11 +13,12 @@
 import com.intellij.openapi.editor.SelectionModel;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.IconLoader;
 import org.jetbrains.annotations.NotNull;
 
 public class InsertAction extends AnAction implements DumbAware {
     public InsertAction() {
-        super(AllIcons.Vcs.Vendors.Github);
+        super(IconLoader.getIcon("/images/gist.png"));
     }
 
     @Override

src/main/java/com/chuntung/plugin/gistsnippet/view/CustomDropDownLink.java

@@ -60,7 +60,7 @@ public String getSelectedItem() {
     }
 
     /**
-     * Set selected item and trigger consumer.
+     * Only render selected item.
      *
      * @param selectedItem
      */
@@ -73,9 +73,6 @@ public void setSelectedItem(String selectedItem) {
         if (icons.size() > 0) {
             leftIcon.setIcon(icons.get(items.indexOf(selectedItem)));
         }
-        if (consumer != null) {
-            consumer.accept(selectedItem);
-        }
 
         this.selectedItem = selectedItem;
     }
@@ -85,6 +82,9 @@ void showPopup() {
         final BaseListPopupStep<String> list = new BaseListPopupStep<String>(null, items, icons) {
             @Override
             public PopupStep onChosen(String selectedValue, boolean finalChoice) {
+                if (consumer != null) {
+                    consumer.accept(selectedValue);
+                }
                 setSelectedItem(selectedValue);
                 return super.onChosen(selectedValue, finalChoice);
             }

src/main/java/com/chuntung/plugin/gistsnippet/view/CustomTreeCellRenderer.java

@@ -23,7 +23,6 @@
 import com.intellij.ui.components.JBTabbedPane;
 import com.intellij.ui.components.labels.DropDownLink;
 import com.intellij.ui.components.labels.LinkLabel;
-import com.intellij.ui.treeStructure.SimpleNode;
 import com.intellij.ui.treeStructure.SimpleTree;
 import com.intellij.ui.treeStructure.SimpleTreeBuilder;
 import com.intellij.util.Consumer;
@@ -196,6 +195,7 @@ private void initYoursPane(List<GithubAccount> accountList, GithubAccount single
                 currentAccount = chosenItem;
                 // load All Own Gist by default
                 ((CustomDropDownLink) scopeDropDownLink).setSelectedItem("Own");
+                loadOwnGist(false);
             }
         }, true);
 
@@ -297,23 +297,17 @@ private <T> T getUserObject(DefaultMutableTreeNode node) {
     }
 
     private void loadOwnGist(boolean forced) {
-        if (currentAccount == null) {
-            return;
-        }
+        // reset type filter
+        typeDropDownLink.setText("All");
 
-        // com.intellij.util.io.HttpRequests.process does not allow Network accessed in dispatch thread or read action
-        // start a background task to access network due to api limitation
+        // com.intellij.util.io.HttpRequests#process does not allow Network accessed in dispatch thread or read action
+        // start a background task to bypass api limitation
         new Task.Backgroundable(project, "Loading own gists...") {
-
-            private List<GistDTO> ownGist;
-
             @Override
             public void run(@NotNull ProgressIndicator indicator) {
-                ownGist = service.queryOwnGist(currentAccount, forced);
-            }
-
-            @Override
-            public void onSuccess() {
+                List<GistDTO> ownGist = service.queryOwnGist(currentAccount, forced);
+                // non-modal task should not invoke onSuccess() in modal dialog initialization.
+                // it will be blocked in dispatch thread by modal dialog, here just run in background
                 if (ownGist != null) {
                     renderTree(ownGist, ScopeEnum.OWN);
                 }
@@ -322,20 +316,13 @@ public void onSuccess() {
     }
 
     private void loadStarredGist(boolean forced) {
-        if (currentAccount == null) {
-            return;
-        }
+        // reset type filter
+        typeDropDownLink.setText("All");
 
         new Task.Backgroundable(project, "Loading starred gists...") {
-            private List<GistDTO> starredGist;
-
             @Override
             public void run(@NotNull ProgressIndicator indicator) {
-                starredGist = service.queryStarredGist(currentAccount, forced);
-            }
-
-            @Override
-            public void onSuccess() {
+                List<GistDTO> starredGist = service.queryStarredGist(currentAccount, forced);
                 if (starredGist != null) {
                     renderTree(starredGist, ScopeEnum.STARRED);
                 }
@@ -346,9 +333,6 @@ public void onSuccess() {
     private void renderTree(List<GistDTO> gistList, ScopeEnum scope) {
         snippetRoot.setSetChildren(gistList, scope);
         treeBuilder.queueUpdate();
-
-        // reset type filter
-        typeDropDownLink.setText("All");
     }
 
     @Nullable

src/main/java/com/chuntung/plugin/gistsnippet/view/InsertGistDialog.java

@@ -4,7 +4,7 @@
     <vendor email="ho@chuntung.com" url="https://gist.chuntung.com">Tony Ho</vendor>
 
     <description><![CDATA[
-    A code snippet tool based on GitHub gist, provides with an ability to fetch secret or starred gist of GitHub accounts.
+    A code snippet tool based on GitHub gist, which provides with an ability to fetch secret or starred gist of GitHub accounts.
     It depends on built-in GitHub plugin which should be enabled.
     ]]></description>