Add command 'listRemoteDockerProcess' and variable 'pickRemoteDockerP…

…rocess' (#4617) * Add command 'listRemoteDockerProcess' This will enable the old RemoteAttachPicker call that will only return processIds. * Address PR issues and fix command
dotnet · Jun 17, 2021 · 5ae9984 · 5ae9984
1 parent 3534e25
commit 5ae9984
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -399,6 +399,7 @@
     "onCommand:csharp.downloadDebugger",
     "onCommand:csharp.listProcess",
     "onCommand:csharp.listRemoteProcess",
+    "onCommand:csharp.listRemoteDockerProcess",
     "onCommand:omnisharp.registerLanguageMiddleware",
     "workspaceContains:project.json",
     "workspaceContains:*.csproj",
@@ -974,6 +975,11 @@
         "title": "List processes on remote connection for attach",
         "category": "CSharp"
       },
+      {
+        "command": "csharp.listRemoteDockerProcess",
+        "title": "List processes on Docker connection",
+        "category": "CSharp"
+      },
       {
         "command": "csharp.reportIssue",
         "title": "Report an issue",
@@ -1043,7 +1049,8 @@
         "label": ".NET Core",
         "variables": {
           "pickProcess": "csharp.listProcess",
-          "pickRemoteProcess": "csharp.listRemoteProcess"
+          "pickRemoteProcess": "csharp.listRemoteProcess",
+          "pickRemoteDockerProcess": "csharp.listRemoteDockerProcess"
         },
         "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
         "configurationAttributes": {
@@ -2142,7 +2149,8 @@
         "label": ".NET",
         "variables": {
           "pickProcess": "csharp.listProcess",
-          "pickRemoteProcess": "csharp.listRemoteProcess"
+          "pickRemoteProcess": "csharp.listRemoteProcess",
+          "pickRemoteDockerProcess": "csharp.listRemoteDockerProcess"
         },
         "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
         "configurationAttributes": {

diff --git a/src/features/commands.ts b/src/features/commands.ts
@@ -11,6 +11,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as protocol from '../omnisharp/protocol';
 import * as vscode from 'vscode';
+import { RemoteAttachPicker } from './processPicker';
 import { generateAssets } from '../assets';
 import { ShowOmniSharpChannel, CommandDotNetRestoreStart, CommandDotNetRestoreProgress, CommandDotNetRestoreSucceeded, CommandDotNetRestoreFailed } from '../omnisharp/loggingEvents';
 import { EventStream } from '../EventStream';
@@ -42,6 +43,12 @@ export default function registerCommands(context: vscode.ExtensionContext, serve
     disposable.add(vscode.commands.registerCommand('csharp.listProcess', () => ""));
     disposable.add(vscode.commands.registerCommand('csharp.listRemoteProcess', () => ""));
 
+    // List remote processes for docker extension.
+    // Change to return "" when https://github.com/microsoft/vscode/issues/110889 is resolved.
+    disposable.add(vscode.commands.registerCommand('csharp.listRemoteDockerProcess', async (args) => {
+        const attachItem = await RemoteAttachPicker.ShowAttachEntries(args, platformInfo);
+        return attachItem ? attachItem.id : Promise.reject<string>(new Error("Could not find a process id to attach."));
+    }));
 
     // Register command for generating tasks.json and launch.json assets.
     disposable.add(vscode.commands.registerCommand('dotnet.generateAssets', async (selectedIndex) => generateAssets(server, selectedIndex)));