Fix handling of kernels

src/console/panel.ts

@@ -89,28 +89,8 @@ class ConsolePanel extends Panel {
    * Handle `'close-request'` messages.
    */
   protected onCloseRequest(msg: Message): void {
-    let session = this._content.session;
-
-    if (!session || !session.kernel) {
-      super.onCloseRequest(msg);
-      this.dispose();
-      return;
-    }
-
-    session.kernel.getSpec().then(spec => {
-      let name = spec.display_name;
-      return showDialog({
-        title: 'Shut down kernel?',
-        body: `Shut down ${name}?`
-      });
-    }).then(value => {
-      if (value && value.text === 'OK') {
-        return session.shutdown();
-      }
-    }).then(() => {
-      super.onCloseRequest(msg);
-      this.dispose();
-    });
+    super.onCloseRequest(msg);
+    this.dispose();
   }
 
   private _content: ConsoleContent = null;

src/console/plugin.ts

@@ -93,6 +93,11 @@ const LANDSCAPE_ICON_CLASS = 'jp-MainAreaLandscapeIcon';
  */
 const CONSOLE_ICON_CLASS = 'jp-ImageCodeConsole';
 
+/**
+ * A regex for console names.
+ */
+const CONSOLE_REGEX = /^console-(\d)+-[0-9a-f]+$/;
+
 /**
  * The console panel instance tracker.
  */
@@ -227,6 +232,8 @@ function activateConsole(app: JupyterLab, services: IServiceManager, rendermime:
       // If we get a session, use it.
       if (args.id) {
         return manager.connectTo(args.id).then(session => {
+          name = session.path.split('/').pop();
+          name = `Console ${name.match(CONSOLE_REGEX)[1]}`;
           createConsole(session, name);
           manager.listRunning();  // Trigger a refresh.
           return session.id;