Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-20 19:14:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure child instantiation service instances are disposed/tracked for disposal (#230502)

Browse Source
This commit is contained in:
Martin Aeschlimann
2024-10-04 18:23:32 +02:00
committed by GitHub
parent 984db9964b
commit 02e83d3d4f
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/api/browser/mainThreadCLICommands.ts
+23 -17
View File
@@ -65,28 +65,34 @@ CommandsRegistry.registerCommand('_remoteCLI.manageExtensions', async function (
lines.push(message);
}
}();
const cliService = instantiationService.createChild(new ServiceCollection([IExtensionManagementService, remoteExtensionManagementService])).createInstance(RemoteExtensionManagementCLI, logger);
const childInstantiationService = instantiationService.createChild(new ServiceCollection([IExtensionManagementService, remoteExtensionManagementService]));
try {
const cliService = childInstantiationService.createInstance(RemoteExtensionManagementCLI, logger);
if (args.list) {
await cliService.listExtensions(!!args.list.showVersions, args.list.category, undefined);
} else {
const revive = (inputs: (string | UriComponents)[]) => inputs.map(input => isString(input) ? input : URI.revive(input));
if (Array.isArray(args.install) && args.install.length) {
try {
await cliService.installExtensions(revive(args.install), [], { isMachineScoped: true }, !!args.force);
} catch (e) {
lines.push(e.message);
if (args.list) {
await cliService.listExtensions(!!args.list.showVersions, args.list.category, undefined);
} else {
const revive = (inputs: (string | UriComponents)[]) => inputs.map(input => isString(input) ? input : URI.revive(input));
if (Array.isArray(args.install) && args.install.length) {
try {
await cliService.installExtensions(revive(args.install), [], { isMachineScoped: true }, !!args.force);
} catch (e) {
lines.push(e.message);
}
}
}
if (Array.isArray(args.uninstall) && args.uninstall.length) {
try {
await cliService.uninstallExtensions(revive(args.uninstall), !!args.force, undefined);
} catch (e) {
lines.push(e.message);
if (Array.isArray(args.uninstall) && args.uninstall.length) {
try {
await cliService.uninstallExtensions(revive(args.uninstall), !!args.force, undefined);
} catch (e) {
lines.push(e.message);
}
}
}
return lines.join('\n');
} finally {
childInstantiationService.dispose();
}
return lines.join('\n');
});
class RemoteExtensionManagementCLI extends ExtensionManagementCLI {