Update terminal plugin commands.

src/launcher/plugin.ts

@@ -34,7 +34,7 @@ import {
 } from '../services';
 
 import {
-  cmdIds as terminalCmdIds
+  CommandIDs as TerminalCommandIDs
 } from '../terminal';
 
 import {
@@ -106,7 +106,7 @@ function activate(app: JupyterLab, services: IServiceManager, pathTracker: IPath
   if (services.terminals.isAvailable()) {
     defaults.push({
       name: 'Terminal',
-      command: terminalCmdIds.createNew
+      command: TerminalCommandIDs.createNew
     });
   }
 

src/running/plugin.ts

@@ -22,7 +22,7 @@ import {
 } from '../services';
 
 import {
-  cmdIds as terminalCmdIds
+  CommandIDs as TerminalCommandIDs
 } from '../terminal';
 
 import {
@@ -72,7 +72,7 @@ function activate(app: JupyterLab, services: IServiceManager, restorer: IInstanc
   });
 
   running.terminalOpenRequested.connect((sender, model) => {
-    app.commands.execute(terminalCmdIds.open, { name: model.name });
+    app.commands.execute(TerminalCommandIDs.open, { name: model.name });
   });
 
   // Rank has been chosen somewhat arbitrarily to give priority to the running

src/terminal/index.ts

@@ -5,13 +5,22 @@ export * from './widget';
 
 
 /**
- * The map of command ids used by the terminal plugin.
+ * The command IDs used by the terminal plugin.
  */
 export
-const cmdIds = {
-  createNew: 'terminal:create-new',
-  open: 'terminal:open',
-  increaseFont: 'terminal:increase-font',
-  decreaseFont: 'terminal:decrease-font',
-  toggleTheme: 'terminal:toggle-theme'
+namespace CommandIDs {
+  export
+  const createNew = 'terminal:create-new';
+
+  export
+  const open = 'terminal:open';
+
+  export
+  const increaseFont = 'terminal:increase-font';
+
+  export
+  const decreaseFont = 'terminal:decrease-font';
+
+  export
+  const toggleTheme = 'terminal:toggle-theme';
 };

src/terminal/plugin.ts

@@ -34,7 +34,7 @@ import {
 } from '../services';
 
 import {
-  TerminalWidget, cmdIds
+  CommandIDs, TerminalWidget
 } from './';
 
 
@@ -91,13 +91,13 @@ function activate(app: JupyterLab, services: IServiceManager, mainMenu: IMainMen
 
   // Handle state restoration.
   restorer.restore(tracker, {
-    command: cmdIds.createNew,
+    command: CommandIDs.createNew,
     args: widget => ({ name: widget.session.name }),
     name: widget => widget.session && widget.session.name
   });
 
   // Add terminal commands.
-  commands.addCommand(cmdIds.createNew, {
+  commands.addCommand(CommandIDs.createNew, {
     label: 'New Terminal',
     caption: 'Start a new terminal session',
     execute: args => {
@@ -122,7 +122,7 @@ function activate(app: JupyterLab, services: IServiceManager, mainMenu: IMainMen
     }
   });
 
-  commands.addCommand(cmdIds.increaseFont, {
+  commands.addCommand(CommandIDs.increaseFont, {
     label: 'Increase Terminal Font Size',
     execute: () => {
       if (options.fontSize < 72) {
@@ -132,7 +132,7 @@ function activate(app: JupyterLab, services: IServiceManager, mainMenu: IMainMen
     }
   });
 
-  commands.addCommand(cmdIds.decreaseFont, {
+  commands.addCommand(CommandIDs.decreaseFont, {
     label: 'Decrease Terminal Font Size',
     execute: () => {
       if (options.fontSize > 9) {
@@ -142,7 +142,7 @@ function activate(app: JupyterLab, services: IServiceManager, mainMenu: IMainMen
     }
   });
 
-  commands.addCommand(cmdIds.toggleTheme, {
+  commands.addCommand(CommandIDs.toggleTheme, {
     label: 'Toggle Terminal Theme',
     caption: 'Switch Terminal Background and Font Colors',
     execute: () => {
@@ -160,7 +160,7 @@ function activate(app: JupyterLab, services: IServiceManager, mainMenu: IMainMen
     }
   });
 
-  commands.addCommand(cmdIds.open, {
+  commands.addCommand(CommandIDs.open, {
     execute: args => {
       let name = args['name'] as string;
       // Check for a running terminal with the given name.
@@ -169,7 +169,7 @@ function activate(app: JupyterLab, services: IServiceManager, mainMenu: IMainMen
         app.shell.activateMain(widget.id);
       } else {
         // Otherwise, create a new terminal with a given name.
-        return commands.execute(cmdIds.createNew, { name });
+        return commands.execute(CommandIDs.createNew, { name });
       }
     }
   });
@@ -177,8 +177,11 @@ function activate(app: JupyterLab, services: IServiceManager, mainMenu: IMainMen
   // Add command palette and menu items.
   let menu = new Menu({ commands, keymap });
   menu.title.label = category;
-  [cmdIds.createNew, cmdIds.increaseFont, cmdIds.decreaseFont,
-   cmdIds.toggleTheme
+  [
+    CommandIDs.createNew,
+    CommandIDs.increaseFont,
+    CommandIDs.decreaseFont,
+    CommandIDs.toggleTheme
   ].forEach(command => {
     palette.addItem({ command, category });
     menu.addItem({ command });