Skip to content

Commit 5ae9984

Browse files
authored
Add command 'listRemoteDockerProcess' and variable 'pickRemoteDockerProcess' (#4617)
* Add command 'listRemoteDockerProcess' This will enable the old RemoteAttachPicker call that will only return processIds. * Address PR issues and fix command
1 parent 3534e25 commit 5ae9984

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

package.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@
399399
"onCommand:csharp.downloadDebugger",
400400
"onCommand:csharp.listProcess",
401401
"onCommand:csharp.listRemoteProcess",
402+
"onCommand:csharp.listRemoteDockerProcess",
402403
"onCommand:omnisharp.registerLanguageMiddleware",
403404
"workspaceContains:project.json",
404405
"workspaceContains:*.csproj",
@@ -974,6 +975,11 @@
974975
"title": "List processes on remote connection for attach",
975976
"category": "CSharp"
976977
},
978+
{
979+
"command": "csharp.listRemoteDockerProcess",
980+
"title": "List processes on Docker connection",
981+
"category": "CSharp"
982+
},
977983
{
978984
"command": "csharp.reportIssue",
979985
"title": "Report an issue",
@@ -1043,7 +1049,8 @@
10431049
"label": ".NET Core",
10441050
"variables": {
10451051
"pickProcess": "csharp.listProcess",
1046-
"pickRemoteProcess": "csharp.listRemoteProcess"
1052+
"pickRemoteProcess": "csharp.listRemoteProcess",
1053+
"pickRemoteDockerProcess": "csharp.listRemoteDockerProcess"
10471054
},
10481055
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
10491056
"configurationAttributes": {
@@ -2142,7 +2149,8 @@
21422149
"label": ".NET",
21432150
"variables": {
21442151
"pickProcess": "csharp.listProcess",
2145-
"pickRemoteProcess": "csharp.listRemoteProcess"
2152+
"pickRemoteProcess": "csharp.listRemoteProcess",
2153+
"pickRemoteDockerProcess": "csharp.listRemoteDockerProcess"
21462154
},
21472155
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
21482156
"configurationAttributes": {

src/features/commands.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import * as fs from 'fs';
1111
import * as path from 'path';
1212
import * as protocol from '../omnisharp/protocol';
1313
import * as vscode from 'vscode';
14+
import { RemoteAttachPicker } from './processPicker';
1415
import { generateAssets } from '../assets';
1516
import { ShowOmniSharpChannel, CommandDotNetRestoreStart, CommandDotNetRestoreProgress, CommandDotNetRestoreSucceeded, CommandDotNetRestoreFailed } from '../omnisharp/loggingEvents';
1617
import { EventStream } from '../EventStream';
@@ -42,6 +43,12 @@ export default function registerCommands(context: vscode.ExtensionContext, serve
4243
disposable.add(vscode.commands.registerCommand('csharp.listProcess', () => ""));
4344
disposable.add(vscode.commands.registerCommand('csharp.listRemoteProcess', () => ""));
4445

46+
// List remote processes for docker extension.
47+
// Change to return "" when https://github.com/microsoft/vscode/issues/110889 is resolved.
48+
disposable.add(vscode.commands.registerCommand('csharp.listRemoteDockerProcess', async (args) => {
49+
const attachItem = await RemoteAttachPicker.ShowAttachEntries(args, platformInfo);
50+
return attachItem ? attachItem.id : Promise.reject<string>(new Error("Could not find a process id to attach."));
51+
}));
4552

4653
// Register command for generating tasks.json and launch.json assets.
4754
disposable.add(vscode.commands.registerCommand('dotnet.generateAssets', async (selectedIndex) => generateAssets(server, selectedIndex)));

0 commit comments

Comments
 (0)