Merge pull request #5917 from ian-r-rose/fault-tolerant-terminal-start

Start a new terminal if connecting to an old one fails.
jupyterlab · Jan 31, 2019 · 0b527fa · 0b527fa
2 parents 08449a8 + 06ff93d
commit 0b527fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/packages/console-extension/src/index.ts b/packages/console-extension/src/index.ts
@@ -146,10 +146,16 @@ async function activateConsole(
 
   // Handle state restoration.
   restorer.restore(tracker, {
-    command: CommandIDs.open,
+    command: CommandIDs.create,
     args: panel => ({
       path: panel.console.session.path,
-      name: panel.console.session.name
+      name: panel.console.session.name,
+      kernelPreference: {
+        name: panel.console.session.kernel && panel.console.session.kernel.name,
+        language:
+          panel.console.session.language &&
+          panel.console.session.kernel.language
+      }
     }),
     name: panel => panel.console.session.path,
     when: manager.ready

diff --git a/packages/terminal-extension/src/index.ts b/packages/terminal-extension/src/index.ts
@@ -208,7 +208,9 @@ export function addCommands(
       const name = args['name'] as string;
       const term = new Terminal();
       const promise = name
-        ? serviceManager.terminals.connectTo(name)
+        ? serviceManager.terminals
+            .connectTo(name)
+            .catch(() => serviceManager.terminals.startNew())
         : serviceManager.terminals.startNew();
 
       term.title.icon = TERMINAL_ICON_CLASS;