Clean up git menu

Author: Marc Udoff

src/gitMenuCommands.ts

@@ -63,7 +63,8 @@ export function addCommands(
         console.error(e);
         main.dispose();
       }
-    }
+    },
+    isVisible: () => model.pathRepository !== null
   });
 
   /** Add open/go to git interface command */
@@ -95,7 +96,8 @@ export function addCommands(
         await model.init(currentPath);
         model.pathRepository = currentPath;
       }
-    }
+    },
+    isVisible: () => model.pathRepository === null
   });
 
   /** Open URL externally */
@@ -129,7 +131,7 @@ export function addCommands(
   commands.addCommand(CommandIDs.gitAddRemote, {
     label: 'Add remote repository',
     caption: 'Add a Git remote repository',
-    isEnabled: () => model.pathRepository !== null,
+    isVisible: () => model.pathRepository !== null,
     execute: async args => {
       if (model.pathRepository === null) {
         console.warn('Not in a Git repository. Unable to add a remote.');
@@ -168,6 +170,7 @@ export function addCommands(
     execute: async () => {
       await doGitClone(model, fileBrowser.model.path);
       fileBrowser.model.refresh();
-    }
+    },
+    isVisible: () => model.pathRepository === null
   });
 }

src/index.ts

@@ -143,30 +143,32 @@ function createGitMenu(
   const menu = new Menu({ commands });
   menu.title.label = 'Git';
   [
-    CommandIDs.gitUI,
-    CommandIDs.gitTerminalCommand,
     CommandIDs.gitInit,
     CommandIDs.gitClone,
-    CommandIDs.gitAddRemote
+    CommandIDs.gitAddRemote,
+    CommandIDs.gitTerminalCommand
   ].forEach(command => {
     menu.addItem({ command });
   });
 
+  menu.addItem({ type: 'separator' });
+
+  menu.addItem({ command: CommandIDs.gitToggleSimpleStaging });
+
+  menu.addItem({ command: CommandIDs.gitToggleDoubleClickDiff });
+
+  menu.addItem({ type: 'separator' });
+
   const tutorial = new Menu({ commands });
-  tutorial.title.label = ' Tutorial ';
+  tutorial.title.label = ' Help ';
   RESOURCES.map(args => {
     tutorial.addItem({
       args,
       command: CommandIDs.gitOpenUrl
     });
   });
-  menu.addItem({ type: 'submenu', submenu: tutorial });
-
-  menu.addItem({ type: 'separator' });
 
-  menu.addItem({ command: CommandIDs.gitToggleSimpleStaging });
-
-  menu.addItem({ command: CommandIDs.gitToggleDoubleClickDiff });
+  menu.addItem({ type: 'submenu', submenu: tutorial });
 
   return menu;
 }