resolve conflict shortcut for windows

Author: chuntungho

src/main/java/com/chuntung/plugin/gistsnippet/service/GistSnippetService.java

@@ -153,6 +153,7 @@ public void deleteGist(GithubAccount account, List<String> gistIds) {
             GithubApiRequestExecutor executor = GithubApiRequestExecutorManager.getInstance().getExecutor(account);
             for (String gistId : gistIds) {
                 String url = String.format(GIST_DETAIL_URL, gistId);
+                // 2018.3
                 GithubApiRequest.Delete delete = new GithubApiRequest.Delete(url);
                 executor.execute(delete);
                 gistCache.remove(gistId);

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

@@ -146,9 +146,11 @@ public void mouseClicked(MouseEvent e) {
             treeModel.addTreeModelListener(new TreeModelAdapter() {
                 protected void process(@NotNull TreeModelEvent event, @NotNull EventType type) {
                     if (snippetRoot.children().size() > 0 && snippetTree.getSelectionCount() == 0) {
-                        snippetStructure.getInvoker().runOrInvokeLater(() -> {
-                            snippetTree.setSelectionRow(0);
-                            snippetTree.requestFocusInWindow();
+                        UIUtil.invokeLaterIfNeeded(() -> {
+                            if (snippetRoot.children().size() > 0 && snippetTree.getSelectionCount() == 0) {
+                                snippetTree.setSelectionRow(0);
+                                snippetTree.requestFocusInWindow();
+                            }
                         });
                     }
                 }

src/main/resources/META-INF/plugin.xml

@@ -27,8 +27,9 @@
                 description="Search gist and then insert selection into current editor"
                 class="com.chuntung.plugin.gistsnippet.action.InsertAction">
             <add-to-group group-id="EditorPopupMenu" anchor="after" relative-to-action="Github.Create.Gist"/>
-            <keyboard-shortcut keymap="$default" first-keystroke="control alt I" />
-            <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="control alt I" replace-all="true"/>
+            <keyboard-shortcut keymap="$default" first-keystroke="alt I" />
+            <keyboard-shortcut keymap="Mac OS X" first-keystroke="control alt I" replace-all="true"/>
+            <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="meta alt I" replace-all="true"/>
         </action>
     </actions>
 </idea-plugin>