allow opening notebooks via uris (#1254)

dotnet · Apr 15, 2021 · e29a516 · WhiteBlackGoose · Apr 16, 2021 · jonsequitur
1 parent 13a5243
commit e29a516
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 7 deletions.
diff --git a/src/dotnet-interactive-vscode/common/vscode/commands.ts b/src/dotnet-interactive-vscode/common/vscode/commands.ts
@@ -180,11 +180,20 @@ export function registerFileCommands(context: vscode.ExtensionContext, clientMap
             }
         }
 
-        if (jupyterApi) {
-            await vscode.commands.executeCommand('vscode.openWith', notebookUri, 'jupyter-notebook');
-            await switchToInteractiveKernel();
-        } else {
-            await vscode.commands.executeCommand('vscode.openWith', notebookUri, 'dotnet-interactive-jupyter');
+        const extension = path.extname(notebookUri.fsPath);
+        switch (extension) {
+            case '.ipynb':
+                if (jupyterApi) {
+                    await vscode.commands.executeCommand('vscode.openWith', notebookUri, 'jupyter-notebook');
+                    await switchToInteractiveKernel();
+                } else {
+                    await vscode.commands.executeCommand('vscode.openWith', notebookUri, 'dotnet-interactive-jupyter');
+                }
+                break;
+            default:
+                // was .dib or .dotnet-interactive
+                await vscode.commands.executeCommand('vscode.openWith', notebookUri, 'dotnet-interactive');
+                break;
         }
     }));
 

diff --git a/src/dotnet-interactive-vscode/common/vscode/extension.ts b/src/dotnet-interactive-vscode/common/vscode/extension.ts
@@ -56,6 +56,27 @@ export async function activate(context: vscode.ExtensionContext) {
     // this must happen early, because some following functions use the acquisition command
     registerAcquisitionCommands(context, diagnosticsChannel);
 
+    vscode.window.registerUriHandler({
+        handleUri(uri: vscode.Uri): vscode.ProviderResult<void> {
+            switch (uri.path) {
+                case '/newNotebook':
+                    vscode.commands.executeCommand('dotnet-interactive.acquire').then(() => {
+                        vscode.commands.executeCommand('dotnet-interactive.newNotebook').then(() => { });
+                    });
+                    break;
+                case '/openNotebook':
+                    const params = new URLSearchParams(uri.query);
+                    const path = params.get('path');
+                    if (path) {
+                        vscode.commands.executeCommand('dotnet-interactive.acquire').then(() => {
+                            vscode.commands.executeCommand('dotnet-interactive.openNotebook', vscode.Uri.file(path)).then(() => { });
+                        });
+                    }
+                    break;
+            }
+        }
+    });
+
     // register with VS Code
     const clientMapper = new ClientMapper(async (notebookPath) => {
         const minDotNetSdkVersion = config.get<string>('minimumDotNetSdkVersion') || '5.0';

diff --git a/src/dotnet-interactive-vscode/insiders/package.json b/src/dotnet-interactive-vscode/insiders/package.json
@@ -40,6 +40,7 @@
     "PowerShell"
   ],
   "activationEvents": [
+    "onUri",
     "onNotebook:dotnet-interactive",
     "onNotebook:*",
     "onCommand:dotnet-interactive.acquire",
@@ -103,7 +104,7 @@
         },
         "dotnet-interactive.minimumInteractiveToolVersion": {
           "type": "string",
-          "default": "1.0.221403",
+          "default": "1.0.221503",
           "description": "The minimum required version of the .NET Interactive tool."
         }
       }

diff --git a/src/dotnet-interactive-vscode/stable/package.json b/src/dotnet-interactive-vscode/stable/package.json
@@ -40,6 +40,7 @@
     "PowerShell"
   ],
   "activationEvents": [
+    "onUri",
     "onNotebook:dotnet-interactive",
     "onNotebook:dotnet-interactive-jupyter",
     "onNotebook:*",
@@ -112,7 +113,7 @@
         },
         "dotnet-interactive.minimumInteractiveToolVersion": {
           "type": "string",
-          "default": "1.0.221403",
+          "default": "1.0.221503",
           "description": "The minimum required version of the .NET Interactive tool."
         },
         "dotnet-interactive.useDotNetInteractiveExtensionForIpynbFiles": {