@jupyterlab/mainmenu-extension 4.2.0-alpha.2 → 4.2.0-beta.0

package/lib/index.js

@@ -4,7 +4,7 @@
  * @packageDocumentation
  * @module mainmenu-extension
  */
-import { createSemanticCommand, ILabShell, IRouter } from '@jupyterlab/application';
+import { addSemanticCommand, ILabShell, IRouter } from '@jupyterlab/application';
 import { Dialog, ICommandPalette, MenuFactory, showDialog } from '@jupyterlab/apputils';
 import { PageConfig, URLExt } from '@jupyterlab/coreutils';
 import { IMainMenu, MainMenu } from '@jupyterlab/mainmenu';
@@ -168,46 +168,95 @@ const plugin = {
  * Create the basic `Edit` menu.
  */
 function createEditMenu(app, menu, trans) {
-    const commands = app.commands;
+    const { commands, shell } = app;
     // Add the undo/redo commands the the Edit menu.
-    commands.addCommand(CommandIDs.undo, createSemanticCommand(app, menu.undoers.undo, {
-        label: trans.__('Undo')
-    }, trans));
-    commands.addCommand(CommandIDs.redo, createSemanticCommand(app, menu.undoers.redo, {
-        label: trans.__('Redo')
-    }, trans));
+    addSemanticCommand({
+        id: CommandIDs.undo,
+        commands,
+        shell,
+        semanticCommands: menu.undoers.undo,
+        default: {
+            label: trans.__('Undo')
+        },
+        trans
+    });
+    addSemanticCommand({
+        id: CommandIDs.redo,
+        commands,
+        shell,
+        semanticCommands: menu.undoers.redo,
+        default: {
+            label: trans.__('Redo')
+        },
+        trans
+    });
     // Add the clear commands to the Edit menu.
-    commands.addCommand(CommandIDs.clearCurrent, createSemanticCommand(app, menu.clearers.clearCurrent, {
-        label: trans.__('Clear')
-    }, trans));
-    commands.addCommand(CommandIDs.clearAll, createSemanticCommand(app, menu.clearers.clearAll, {
-        label: trans.__('Clear All')
-    }, trans));
-    commands.addCommand(CommandIDs.goToLine, createSemanticCommand(app, menu.goToLiners, {
-        label: trans.__('Go to Line…')
-    }, trans));
+    addSemanticCommand({
+        id: CommandIDs.clearCurrent,
+        commands,
+        shell,
+        semanticCommands: menu.clearers.clearCurrent,
+        default: {
+            label: trans.__('Clear')
+        },
+        trans
+    });
+    addSemanticCommand({
+        id: CommandIDs.clearAll,
+        commands,
+        shell,
+        semanticCommands: menu.clearers.clearAll,
+        default: {
+            label: trans.__('Clear All')
+        },
+        trans
+    });
+    addSemanticCommand({
+        id: CommandIDs.goToLine,
+        commands,
+        shell,
+        semanticCommands: menu.goToLiners,
+        default: {
+            label: trans.__('Go to Line…')
+        },
+        trans
+    });
 }
 /**
  * Create the basic `File` menu.
  */
 function createFileMenu(app, menu, router, trans) {
-    const commands = app.commands;
+    const { commands, shell } = app;
     // Add a delegator command for closing and cleaning up an activity.
     // This one is a bit different, in that we consider it enabled
     // even if it cannot find a delegate for the activity.
     // In that case, we instead call the application `close` command.
-    commands.addCommand(CommandIDs.closeAndCleanup, {
-        ...createSemanticCommand(app, menu.closeAndCleaners, {
+    addSemanticCommand({
+        id: CommandIDs.closeAndCleanup,
+        commands,
+        shell,
+        semanticCommands: menu.closeAndCleaners,
+        default: {
             execute: 'application:close',
             label: trans.__('Close and Shut Down'),
             isEnabled: true
-        }, trans),
-        isEnabled: () => !!app.shell.currentWidget && !!app.shell.currentWidget.title.closable
+        },
+        overrides: {
+            isEnabled: () => !!app.shell.currentWidget && !!app.shell.currentWidget.title.closable
+        },
+        trans
     });
     // Add a delegator command for creating a console for an activity.
-    commands.addCommand(CommandIDs.createConsole, createSemanticCommand(app, menu.consoleCreators, {
-        label: trans.__('New Console for Activity')
-    }, trans));
+    addSemanticCommand({
+        id: CommandIDs.createConsole,
+        commands,
+        shell,
+        semanticCommands: menu.consoleCreators,
+        default: {
+            label: trans.__('New Console for Activity')
+        },
+        trans
+    });
     commands.addCommand(CommandIDs.shutdown, {
         label: trans.__('Shut Down'),
         caption: trans.__('Shut down JupyterLab'),
@@ -280,34 +329,75 @@ function createFileMenu(app, menu, router, trans) {
  * Create the basic `Kernel` menu.
  */
 function createKernelMenu(app, menu, trans) {
-    const commands = app.commands;
-    commands.addCommand(CommandIDs.interruptKernel, {
-        ...createSemanticCommand(app, menu.kernelUsers.interruptKernel, {
+    const { commands, shell } = app;
+    addSemanticCommand({
+        id: CommandIDs.interruptKernel,
+        commands,
+        shell,
+        semanticCommands: menu.kernelUsers.interruptKernel,
+        default: {
             label: trans.__('Interrupt Kernel'),
             caption: trans.__('Interrupt the kernel')
-        }, trans),
-        icon: args => (args.toolbar ? stopIcon : undefined)
+        },
+        overrides: { icon: args => (args.toolbar ? stopIcon : undefined) },
+        trans
+    });
+    addSemanticCommand({
+        id: CommandIDs.reconnectToKernel,
+        commands,
+        shell,
+        semanticCommands: menu.kernelUsers.reconnectToKernel,
+        default: {
+            label: trans.__('Reconnect to Kernel')
+        },
+        trans
     });
-    commands.addCommand(CommandIDs.reconnectToKernel, createSemanticCommand(app, menu.kernelUsers.reconnectToKernel, {
-        label: trans.__('Reconnect to Kernel')
-    }, trans));
-    commands.addCommand(CommandIDs.restartKernel, {
-        ...createSemanticCommand(app, menu.kernelUsers.restartKernel, {
+    addSemanticCommand({
+        id: CommandIDs.restartKernel,
+        commands,
+        shell,
+        semanticCommands: menu.kernelUsers.restartKernel,
+        default: {
             label: trans.__('Restart Kernel…'),
             caption: trans.__('Restart the kernel')
-        }, trans),
-        icon: args => (args.toolbar ? refreshIcon : undefined)
+        },
+        overrides: { icon: args => (args.toolbar ? refreshIcon : undefined) },
+        trans
+    });
+    addSemanticCommand({
+        id: CommandIDs.restartKernelAndClear,
+        commands,
+        shell,
+        semanticCommands: [
+            menu.kernelUsers.restartKernel,
+            menu.kernelUsers.clearWidget
+        ],
+        default: {
+            label: trans.__('Restart Kernel and Clear…')
+        },
+        trans
+    });
+    addSemanticCommand({
+        id: CommandIDs.changeKernel,
+        commands,
+        shell,
+        semanticCommands: menu.kernelUsers.changeKernel,
+        default: {
+            label: trans.__('Change Kernel…')
+        },
+        trans
+    });
+    addSemanticCommand({
+        id: CommandIDs.shutdownKernel,
+        commands,
+        shell,
+        semanticCommands: menu.kernelUsers.shutdownKernel,
+        default: {
+            label: trans.__('Shut Down Kernel'),
+            caption: trans.__('Shut down kernel')
+        },
+        trans
     });
-    commands.addCommand(CommandIDs.restartKernelAndClear, createSemanticCommand(app, [menu.kernelUsers.restartKernel, menu.kernelUsers.clearWidget], {
-        label: trans.__('Restart Kernel and Clear…')
-    }, trans));
-    commands.addCommand(CommandIDs.changeKernel, createSemanticCommand(app, menu.kernelUsers.changeKernel, {
-        label: trans.__('Change Kernel…')
-    }, trans));
-    commands.addCommand(CommandIDs.shutdownKernel, createSemanticCommand(app, menu.kernelUsers.shutdownKernel, {
-        label: trans.__('Shut Down Kernel'),
-        caption: trans.__('Shut down kernel')
-    }, trans));
     commands.addCommand(CommandIDs.shutdownAllKernels, {
         label: trans.__('Shut Down All Kernels…'),
         isEnabled: () => {
@@ -333,39 +423,81 @@ function createKernelMenu(app, menu, trans) {
  * Create the basic `View` menu.
  */
 function createViewMenu(app, menu, trans) {
-    const commands = app.commands;
-    commands.addCommand(CommandIDs.lineNumbering, createSemanticCommand(app, menu.editorViewers.toggleLineNumbers, {
-        label: trans.__('Show Line Numbers')
-    }, trans));
-    commands.addCommand(CommandIDs.matchBrackets, createSemanticCommand(app, menu.editorViewers.toggleMatchBrackets, {
-        label: trans.__('Match Brackets')
-    }, trans));
-    commands.addCommand(CommandIDs.wordWrap, createSemanticCommand(app, menu.editorViewers.toggleWordWrap, {
-        label: trans.__('Wrap Words')
-    }, trans));
+    const { commands, shell } = app;
+    addSemanticCommand({
+        id: CommandIDs.lineNumbering,
+        commands,
+        shell,
+        semanticCommands: menu.editorViewers.toggleLineNumbers,
+        default: {
+            label: trans.__('Show Line Numbers')
+        },
+        trans
+    });
+    addSemanticCommand({
+        id: CommandIDs.matchBrackets,
+        commands,
+        shell,
+        semanticCommands: menu.editorViewers.toggleMatchBrackets,
+        default: {
+            label: trans.__('Match Brackets')
+        },
+        trans
+    });
+    addSemanticCommand({
+        id: CommandIDs.wordWrap,
+        commands,
+        shell,
+        semanticCommands: menu.editorViewers.toggleWordWrap,
+        default: {
+            label: trans.__('Wrap Words')
+        },
+        trans
+    });
 }
 /**
  * Create the basic `Run` menu.
  */
 function createRunMenu(app, menu, trans) {
-    const commands = app.commands;
-    commands.addCommand(CommandIDs.run, {
-        ...createSemanticCommand(app, menu.codeRunners.run, {
+    const { commands, shell } = app;
+    addSemanticCommand({
+        id: CommandIDs.run,
+        commands,
+        shell,
+        semanticCommands: menu.codeRunners.run,
+        default: {
             label: trans.__('Run Selected'),
             caption: trans.__('Run Selected')
-        }, trans),
-        icon: args => (args.toolbar ? runIcon : undefined)
+        },
+        overrides: {
+            icon: args => (args.toolbar ? runIcon : undefined)
+        },
+        trans
+    });
+    addSemanticCommand({
+        id: CommandIDs.runAll,
+        commands,
+        shell,
+        semanticCommands: menu.codeRunners.runAll,
+        default: {
+            label: trans.__('Run All'),
+            caption: trans.__('Run All')
+        },
+        trans
     });
-    commands.addCommand(CommandIDs.runAll, createSemanticCommand(app, menu.codeRunners.runAll, {
-        label: trans.__('Run All'),
-        caption: trans.__('Run All')
-    }, trans));
-    commands.addCommand(CommandIDs.restartAndRunAll, {
-        ...createSemanticCommand(app, [menu.codeRunners.restart, menu.codeRunners.runAll], {
+    addSemanticCommand({
+        id: CommandIDs.restartAndRunAll,
+        commands,
+        shell,
+        semanticCommands: [menu.codeRunners.restart, menu.codeRunners.runAll],
+        default: {
             label: trans.__('Restart Kernel and Run All'),
             caption: trans.__('Restart Kernel and Run All')
-        }, trans),
-        icon: args => (args.toolbar ? fastForwardIcon : undefined)
+        },
+        overrides: {
+            icon: args => (args.toolbar ? fastForwardIcon : undefined)
+        },
+        trans
     });
 }
 /**
@@ -444,10 +576,18 @@ function createTabsMenu(app, menu, labShell, trans) {
  * Create the basic `Help` menu.
  */
 function createHelpMenu(app, menu, trans) {
-    app.commands.addCommand(CommandIDs.getKernel, createSemanticCommand(app, menu.getKernel, {
-        label: trans.__('Get Kernel'),
-        isVisible: false
-    }, trans));
+    const { commands, shell } = app;
+    addSemanticCommand({
+        id: CommandIDs.getKernel,
+        commands,
+        shell,
+        semanticCommands: menu.getKernel,
+        default: {
+            label: trans.__('Get Kernel'),
+            isVisible: false
+        },
+        trans
+    });
 }
 export default [plugin, recentsMenuPlugin];
 /**

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/mainmenu-extension",
-  "version": "4.2.0-alpha.2",
+  "version": "4.2.0-beta.0",
   "description": "JupyterLab - Main Menu Extension",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -38,16 +38,16 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/application": "^4.2.0-alpha.2",
-    "@jupyterlab/apputils": "^4.3.0-alpha.2",
-    "@jupyterlab/coreutils": "^6.2.0-alpha.2",
-    "@jupyterlab/docmanager": "^4.2.0-alpha.2",
-    "@jupyterlab/filebrowser": "^4.2.0-alpha.2",
-    "@jupyterlab/mainmenu": "^4.2.0-alpha.2",
-    "@jupyterlab/services": "^7.2.0-alpha.2",
-    "@jupyterlab/settingregistry": "^4.2.0-alpha.2",
-    "@jupyterlab/translation": "^4.2.0-alpha.2",
-    "@jupyterlab/ui-components": "^4.2.0-alpha.2",
+    "@jupyterlab/application": "^4.2.0-beta.0",
+    "@jupyterlab/apputils": "^4.3.0-beta.0",
+    "@jupyterlab/coreutils": "^6.2.0-beta.0",
+    "@jupyterlab/docmanager": "^4.2.0-beta.0",
+    "@jupyterlab/filebrowser": "^4.2.0-beta.0",
+    "@jupyterlab/mainmenu": "^4.2.0-beta.0",
+    "@jupyterlab/services": "^7.2.0-beta.0",
+    "@jupyterlab/settingregistry": "^4.2.0-beta.0",
+    "@jupyterlab/translation": "^4.2.0-beta.0",
+    "@jupyterlab/ui-components": "^4.2.0-beta.0",
     "@lumino/algorithm": "^2.0.1",
     "@lumino/coreutils": "^2.1.2",
     "@lumino/disposable": "^2.1.2",

package/src/index.ts

@@ -6,7 +6,7 @@
  */
 
 import {
-  createSemanticCommand,
+  addSemanticCommand,
   ILabShell,
   IRouter,
   JupyterFrontEnd,
@@ -266,67 +266,61 @@ function createEditMenu(
   menu: IEditMenu,
   trans: TranslationBundle
 ): void {
-  const commands = app.commands;
-
+  const { commands, shell } = app;
   // Add the undo/redo commands the the Edit menu.
-  commands.addCommand(
-    CommandIDs.undo,
-    createSemanticCommand(
-      app,
-      menu.undoers.undo,
-      {
-        label: trans.__('Undo')
-      },
-      trans
-    )
-  );
-  commands.addCommand(
-    CommandIDs.redo,
-    createSemanticCommand(
-      app,
-      menu.undoers.redo,
-      {
-        label: trans.__('Redo')
-      },
-      trans
-    )
-  );
+  addSemanticCommand({
+    id: CommandIDs.undo,
+    commands,
+    shell,
+    semanticCommands: menu.undoers.undo,
+    default: {
+      label: trans.__('Undo')
+    },
+    trans
+  });
+  addSemanticCommand({
+    id: CommandIDs.redo,
+    commands,
+    shell,
+    semanticCommands: menu.undoers.redo,
+    default: {
+      label: trans.__('Redo')
+    },
+    trans
+  });
 
   // Add the clear commands to the Edit menu.
-  commands.addCommand(
-    CommandIDs.clearCurrent,
-    createSemanticCommand(
-      app,
-      menu.clearers.clearCurrent,
-      {
-        label: trans.__('Clear')
-      },
-      trans
-    )
-  );
-  commands.addCommand(
-    CommandIDs.clearAll,
-    createSemanticCommand(
-      app,
-      menu.clearers.clearAll,
-      {
-        label: trans.__('Clear All')
-      },
-      trans
-    )
-  );
-
-  commands.addCommand(
-    CommandIDs.goToLine,
-    createSemanticCommand(
-      app,
-      menu.goToLiners,
-      {
-        label: trans.__('Go to Line…')
-      },
-      trans
-    )
-  );
+  addSemanticCommand({
+    id: CommandIDs.clearCurrent,
+    commands,
+    shell,
+    semanticCommands: menu.clearers.clearCurrent,
+    default: {
+      label: trans.__('Clear')
+    },
+    trans
+  });
+  addSemanticCommand({
+    id: CommandIDs.clearAll,
+    commands,
+    shell,
+    semanticCommands: menu.clearers.clearAll,
+    default: {
+      label: trans.__('Clear All')
+    },
+    trans
+  });
+
+  addSemanticCommand({
+    id: CommandIDs.goToLine,
+    commands,
+    shell,
+    semanticCommands: menu.goToLiners,
+    default: {
+      label: trans.__('Go to Line…')
+    },
+    trans
+  });
 }
 
 /**
@@ -338,39 +332,40 @@ function createFileMenu(
   router: IRouter,
   trans: TranslationBundle
 ): void {
-  const commands = app.commands;
+  const { commands, shell } = app;
 
   // Add a delegator command for closing and cleaning up an activity.
   // This one is a bit different, in that we consider it enabled
   // even if it cannot find a delegate for the activity.
   // In that case, we instead call the application `close` command.
-  commands.addCommand(CommandIDs.closeAndCleanup, {
-    ...createSemanticCommand(
-      app,
-      menu.closeAndCleaners,
-      {
-        execute: 'application:close',
-        label: trans.__('Close and Shut Down'),
-        isEnabled: true
-      },
-      trans
-    ),
-    isEnabled: () =>
-      !!app.shell.currentWidget && !!app.shell.currentWidget.title.closable
+  addSemanticCommand({
+    id: CommandIDs.closeAndCleanup,
+    commands,
+    shell,
+    semanticCommands: menu.closeAndCleaners,
+    default: {
+      execute: 'application:close',
+      label: trans.__('Close and Shut Down'),
+      isEnabled: true
+    },
+    overrides: {
+      isEnabled: () =>
+        !!app.shell.currentWidget && !!app.shell.currentWidget.title.closable
+    },
+    trans
   });
 
   // Add a delegator command for creating a console for an activity.
-  commands.addCommand(
-    CommandIDs.createConsole,
-    createSemanticCommand(
-      app,
-      menu.consoleCreators,
-      {
-        label: trans.__('New Console for Activity')
-      },
-      trans
-    )
-  );
+  addSemanticCommand({
+    id: CommandIDs.createConsole,
+    commands,
+    shell,
+    semanticCommands: menu.consoleCreators,
+    default: {
+      label: trans.__('New Console for Activity')
+    },
+    trans
+  });
 
   commands.addCommand(CommandIDs.shutdown, {
     label: trans.__('Shut Down'),
@@ -459,82 +454,82 @@ function createKernelMenu(
   menu: IKernelMenu,
   trans: TranslationBundle
 ): void {
-  const commands = app.commands;
+  const { commands, shell } = app;
+
+  addSemanticCommand({
+    id: CommandIDs.interruptKernel,
+    commands,
+    shell,
+    semanticCommands: menu.kernelUsers.interruptKernel,
+    default: {
+      label: trans.__('Interrupt Kernel'),
+      caption: trans.__('Interrupt the kernel')
+    },
+    overrides: { icon: args => (args.toolbar ? stopIcon : undefined) },
+    trans
+  });
 
-  commands.addCommand(CommandIDs.interruptKernel, {
-    ...createSemanticCommand(
-      app,
-      menu.kernelUsers.interruptKernel,
-      {
-        label: trans.__('Interrupt Kernel'),
-        caption: trans.__('Interrupt the kernel')
-      },
-      trans
-    ),
-    icon: args => (args.toolbar ? stopIcon : undefined)
+  addSemanticCommand({
+    id: CommandIDs.reconnectToKernel,
+
+    commands,
+    shell,
+    semanticCommands: menu.kernelUsers.reconnectToKernel,
+    default: {
+      label: trans.__('Reconnect to Kernel')
+    },
+    trans
   });
 
-  commands.addCommand(
-    CommandIDs.reconnectToKernel,
-    createSemanticCommand(
-      app,
-      menu.kernelUsers.reconnectToKernel,
-      {
-        label: trans.__('Reconnect to Kernel')
-      },
-      trans
-    )
-  );
+  addSemanticCommand({
+    id: CommandIDs.restartKernel,
+    commands,
+    shell,
+    semanticCommands: menu.kernelUsers.restartKernel,
+    default: {
+      label: trans.__('Restart Kernel…'),
+      caption: trans.__('Restart the kernel')
+    },
+    overrides: { icon: args => (args.toolbar ? refreshIcon : undefined) },
+    trans
+  });
 
-  commands.addCommand(CommandIDs.restartKernel, {
-    ...createSemanticCommand(
-      app,
+  addSemanticCommand({
+    id: CommandIDs.restartKernelAndClear,
+    commands,
+    shell,
+    semanticCommands: [
       menu.kernelUsers.restartKernel,
-      {
-        label: trans.__('Restart Kernel…'),
-        caption: trans.__('Restart the kernel')
-      },
-      trans
-    ),
-    icon: args => (args.toolbar ? refreshIcon : undefined)
+      menu.kernelUsers.clearWidget
+    ],
+    default: {
+      label: trans.__('Restart Kernel and Clear…')
+    },
+    trans
   });
 
-  commands.addCommand(
-    CommandIDs.restartKernelAndClear,
-    createSemanticCommand(
-      app,
-      [menu.kernelUsers.restartKernel, menu.kernelUsers.clearWidget],
-      {
-        label: trans.__('Restart Kernel and Clear…')
-      },
-      trans
-    )
-  );
-
-  commands.addCommand(
-    CommandIDs.changeKernel,
-    createSemanticCommand(
-      app,
-      menu.kernelUsers.changeKernel,
-      {
-        label: trans.__('Change Kernel…')
-      },
-      trans
-    )
-  );
-
-  commands.addCommand(
-    CommandIDs.shutdownKernel,
-    createSemanticCommand(
-      app,
-      menu.kernelUsers.shutdownKernel,
-      {
-        label: trans.__('Shut Down Kernel'),
-        caption: trans.__('Shut down kernel')
-      },
-      trans
-    )
-  );
+  addSemanticCommand({
+    id: CommandIDs.changeKernel,
+    commands,
+    shell,
+    semanticCommands: menu.kernelUsers.changeKernel,
+    default: {
+      label: trans.__('Change Kernel…')
+    },
+    trans
+  });
+
+  addSemanticCommand({
+    id: CommandIDs.shutdownKernel,
+    commands,
+    shell,
+    semanticCommands: menu.kernelUsers.shutdownKernel,
+    default: {
+      label: trans.__('Shut Down Kernel'),
+      caption: trans.__('Shut down kernel')
+    },
+    trans
+  });
 
   commands.addCommand(CommandIDs.shutdownAllKernels, {
     label: trans.__('Shut Down All Kernels…'),
@@ -566,43 +561,40 @@ function createViewMenu(
   menu: IViewMenu,
   trans: TranslationBundle
 ): void {
-  const commands = app.commands;
+  const { commands, shell } = app;
+
+  addSemanticCommand({
+    id: CommandIDs.lineNumbering,
+    commands,
+    shell,
+    semanticCommands: menu.editorViewers.toggleLineNumbers,
+    default: {
+      label: trans.__('Show Line Numbers')
+    },
+    trans
+  });
 
-  commands.addCommand(
-    CommandIDs.lineNumbering,
-    createSemanticCommand(
-      app,
-      menu.editorViewers.toggleLineNumbers,
-      {
-        label: trans.__('Show Line Numbers')
-      },
-      trans
-    )
-  );
-
-  commands.addCommand(
-    CommandIDs.matchBrackets,
-    createSemanticCommand(
-      app,
-      menu.editorViewers.toggleMatchBrackets,
-      {
-        label: trans.__('Match Brackets')
-      },
-      trans
-    )
-  );
-
-  commands.addCommand(
-    CommandIDs.wordWrap,
-    createSemanticCommand(
-      app,
-      menu.editorViewers.toggleWordWrap,
-      {
-        label: trans.__('Wrap Words')
-      },
-      trans
-    )
-  );
+  addSemanticCommand({
+    id: CommandIDs.matchBrackets,
+    commands,
+    shell,
+    semanticCommands: menu.editorViewers.toggleMatchBrackets,
+    default: {
+      label: trans.__('Match Brackets')
+    },
+    trans
+  });
+
+  addSemanticCommand({
+    id: CommandIDs.wordWrap,
+    commands,
+    shell,
+    semanticCommands: menu.editorViewers.toggleWordWrap,
+    default: {
+      label: trans.__('Wrap Words')
+    },
+    trans
+  });
 }
 
 /**
@@ -613,45 +605,48 @@ function createRunMenu(
   menu: IRunMenu,
   trans: TranslationBundle
 ): void {
-  const commands = app.commands;
+  const { commands, shell } = app;
+
+  addSemanticCommand({
+    id: CommandIDs.run,
+    commands,
+    shell,
+    semanticCommands: menu.codeRunners.run,
+    default: {
+      label: trans.__('Run Selected'),
+      caption: trans.__('Run Selected')
+    },
+    overrides: {
+      icon: args => (args.toolbar ? runIcon : undefined)
+    },
+    trans
+  });
 
-  commands.addCommand(CommandIDs.run, {
-    ...createSemanticCommand(
-      app,
-      menu.codeRunners.run,
-      {
-        label: trans.__('Run Selected'),
-        caption: trans.__('Run Selected')
-      },
-      trans
-    ),
-    icon: args => (args.toolbar ? runIcon : undefined)
+  addSemanticCommand({
+    id: CommandIDs.runAll,
+    commands,
+    shell,
+    semanticCommands: menu.codeRunners.runAll,
+    default: {
+      label: trans.__('Run All'),
+      caption: trans.__('Run All')
+    },
+    trans
   });
 
-  commands.addCommand(
-    CommandIDs.runAll,
-    createSemanticCommand(
-      app,
-      menu.codeRunners.runAll,
-      {
-        label: trans.__('Run All'),
-        caption: trans.__('Run All')
-      },
-      trans
-    )
-  );
-
-  commands.addCommand(CommandIDs.restartAndRunAll, {
-    ...createSemanticCommand(
-      app,
-      [menu.codeRunners.restart, menu.codeRunners.runAll],
-      {
-        label: trans.__('Restart Kernel and Run All'),
-        caption: trans.__('Restart Kernel and Run All')
-      },
-      trans
-    ),
-    icon: args => (args.toolbar ? fastForwardIcon : undefined)
+  addSemanticCommand({
+    id: CommandIDs.restartAndRunAll,
+    commands,
+    shell,
+    semanticCommands: [menu.codeRunners.restart, menu.codeRunners.runAll],
+    default: {
+      label: trans.__('Restart Kernel and Run All'),
+      caption: trans.__('Restart Kernel and Run All')
+    },
+    overrides: {
+      icon: args => (args.toolbar ? fastForwardIcon : undefined)
+    },
+    trans
   });
 }
 
@@ -746,18 +741,18 @@ function createHelpMenu(
   menu: IHelpMenu,
   trans: TranslationBundle
 ): void {
-  app.commands.addCommand(
-    CommandIDs.getKernel,
-    createSemanticCommand(
-      app,
-      menu.getKernel,
-      {
-        label: trans.__('Get Kernel'),
-        isVisible: false
-      },
-      trans
-    )
-  );
+  const { commands, shell } = app;
+  addSemanticCommand({
+    id: CommandIDs.getKernel,
+    commands,
+    shell,
+    semanticCommands: menu.getKernel,
+    default: {
+      label: trans.__('Get Kernel'),
+      isVisible: false
+    },
+    trans
+  });
 }
 
 export default [plugin, recentsMenuPlugin];