Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5259,6 +5259,11 @@
}
]
},
"processFilter": {
"type": "string",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✨Copilot (agent135): [Moderate] Please add this property to Extension/tools/OptionsSchema.json under CppdbgAttachOptions and regenerate this file. OptionsSchema.json is the documented schema source, and generateOptionsSchema.ts replaces the complete cppdbg attach schema in package.json from it. As written, the next yarn generate-options-schema removes processFilter, including its completion, validation, and documentation. This same source/generated drift previously required #14523 to resynchronize.

"description": "%c_cpp.debuggers.processFilter.description%",
"default": ""
},
"filterStdout": {
"type": "boolean",
"description": "%c_cpp.debuggers.filterStdout.description%",
Expand Down
1 change: 1 addition & 0 deletions Extension/package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,7 @@
"{Locked=\"`${command:pickProcess}`\"}"
]
},
"c_cpp.debuggers.processFilter.description": "Optional regular expression used to match remote attach candidates by label, description, or detail. If exactly one process matches, the debugger attaches automatically. If multiple processes match, the process picker is shown with only matching entries.",
"c_cpp.debuggers.program.attach.markdownDescription": {
"message": "Full path to the program executable. The debugger will search for a running process matching this executable path and attach to it. If multiple processes match, a selection prompt will be shown. This field is required to load debug symbols for the attached process.",
"comment": [
Expand Down
9 changes: 9 additions & 0 deletions Extension/src/Debugger/attachToProcess.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import { CppSettings } from '../LanguageServer/settings';
import { AttachItem, showQuickPick } from './attachQuickPick';
import { PsProcessParser } from './nativeAttach';
import { filterProcessItems } from './processFilter';

import * as os from 'os';
import * as path from 'path';
Expand Down Expand Up @@ -94,6 +95,14 @@ export class RemoteAttachPicker {
throw new Error(localize("no.pipetransport.useextendedremote", "Chosen debug configuration does not contain {0} or {1}", "pipeTransport", "useExtendedRemote"));
}

const matchingProcesses: AttachItem[] | undefined = filterProcessItems(processes, config?.processFilter);
if (matchingProcesses?.length === 1) {
return matchingProcesses[0].id;
}
if (matchingProcesses && matchingProcesses.length > 1) {
processes = matchingProcesses;
}

const attachPickOptions: vscode.QuickPickOptions = {
matchOnDetail: true,
matchOnDescription: true,
Expand Down
32 changes: 32 additions & 0 deletions Extension/src/Debugger/processFilter.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/* --------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All Rights Reserved.
* See 'LICENSE' in the project root for license information.
* ------------------------------------------------------------------------------------------ */

export interface ProcessFilterItem {
label?: string;
description?: string;
detail?: string;
}

export function filterProcessItems<T extends ProcessFilterItem>(items: T[], processFilter?: unknown): T[] | undefined {
// The value comes from launch.json, so it is not guaranteed to be a string.
const trimmedFilter: string | undefined = typeof processFilter === 'string' ? processFilter.trim() : undefined;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✨Copilot (agent135): [Moderate] Please preserve the configured regex here. Leading and trailing whitespace is valid regex syntax: for example, ^my-daemon intentionally does not match my-daemon-helper, but trimming changes it to ^my-daemon. If that broadened expression has exactly one match, the code silently auto-attaches to the wrong PID instead of falling back to the picker. Trimming can still be used to detect an empty/all-whitespace value, but construct RegExp from the original string and add an edge-whitespace test.

if (!trimmedFilter) {
return undefined;
}

let processRegex: RegExp;
try {
processRegex = new RegExp(trimmedFilter);
} catch {
throw new Error(`Invalid processFilter regular expression: ${trimmedFilter}`);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✨Copilot (agent135): [Minor] This newly introduced exception is user-facing through both remote-picker invocation paths, but its text is hard-coded English. Please route it through the existing vscode-nls/package.nls.json localization path (locking the processFilter identifier as appropriate) so localized installations receive a translated diagnostic.

}

return items.filter((item: T) => {
const label: string = item.label ?? "";
const description: string = item.description ?? "";
const detail: string = item.detail ?? "";
return processRegex.test(label) || processRegex.test(description) || processRegex.test(detail);
});
}
49 changes: 49 additions & 0 deletions Extension/test/unit/processFilter.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/* --------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All Rights Reserved.
* See 'LICENSE' in the project root for license information.
* ------------------------------------------------------------------------------------------ */

import { deepStrictEqual, strictEqual, throws } from 'assert';
import { describe, it } from 'mocha';
import { filterProcessItems } from '../../src/Debugger/processFilter';

interface TestProcessItem {
label?: string;
description?: string;
detail?: string;
id: string;
}

describe('Remote attach process filter', () => {
const processes: TestProcessItem[] = [
{ id: '101', label: 'root /usr/bin/my-daemon --serve', description: '101' },
{ id: '102', label: 'root /usr/bin/other-service', description: '102', detail: 'worker' },
{ id: '103', label: 'app /usr/bin/my-daemon --once', description: '103' }
];

it('returns undefined when filter is empty', () => {
strictEqual(filterProcessItems(processes, ''), undefined);
strictEqual(filterProcessItems(processes, ' '), undefined);
strictEqual(filterProcessItems(processes, undefined), undefined);
});

it('returns undefined when filter is not a string', () => {
strictEqual(filterProcessItems(processes, 1234), undefined);
strictEqual(filterProcessItems(processes, true), undefined);
strictEqual(filterProcessItems(processes, {}), undefined);
});

it('matches by label and description and detail', () => {
deepStrictEqual(filterProcessItems(processes, 'other-service')?.map(p => p.id), ['102']);
deepStrictEqual(filterProcessItems(processes, '^101$')?.map(p => p.id), ['101']);
deepStrictEqual(filterProcessItems(processes, 'worker')?.map(p => p.id), ['102']);
});

it('returns multiple matches when regex matches more than one process', () => {
deepStrictEqual(filterProcessItems(processes, 'my-daemon')?.map(p => p.id), ['101', '103']);
});

it('throws for invalid regular expression', () => {
throws(() => filterProcessItems(processes, '['), /Invalid processFilter regular expression/);
});
});
Loading