From a4046bc5a50e15ec56efd6e1908e134c01b9ef54 Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Mon, 12 May 2025 10:58:18 -0700 Subject: [PATCH] update so edit extensions.json --- .../void/browser/extensionTransferService.ts | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/vs/workbench/contrib/void/browser/extensionTransferService.ts b/src/vs/workbench/contrib/void/browser/extensionTransferService.ts index 0ba57cd4..39269a12 100644 --- a/src/vs/workbench/contrib/void/browser/extensionTransferService.ts +++ b/src/vs/workbench/contrib/void/browser/extensionTransferService.ts @@ -42,6 +42,9 @@ const extensionBlacklist = [ ]; +const isBlacklisted = (fsPath: string | undefined) => { + return extensionBlacklist.find(bItem => fsPath?.includes(bItem)) +} class ExtensionTransferService extends Disposable implements IExtensionTransferService { _serviceBrand: undefined; @@ -89,25 +92,21 @@ class ExtensionTransferService extends Disposable implements IExtensionTransferS await fileService.createFolder(toParent) } for (const extensionFolder of stat.children ?? []) { - if (extensionBlacklist.find(bItem => extensionFolder.resource.path.includes(bItem))) { - console.log('Skipping...', extensionFolder.resource.path) - continue - } const from = extensionFolder.resource const to = URI.joinPath(toParent, extensionFolder.name) const toStat = await fileService.resolve(from) if (toStat.isDirectory) { - await fileService.copy(from, to, true) + if (!isBlacklisted(extensionFolder.resource.fsPath)) { + await fileService.copy(from, to, true) + } } else if (toStat.isFile) { if (extensionFolder.name === 'extensions.json') { try { const contentsStr = await fileService.readFile(from) const json: any = JSON.parse(contentsStr.value.toString()) - const j2 = json.filter((entry: { identifier?: { id?: string } }) => - !extensionBlacklist.find(bItem => entry?.identifier?.id?.includes(bItem)) - ) + const j2 = json.filter((entry: { identifier?: { id?: string } }) => !isBlacklisted(entry?.identifier?.id)) const jsonStr = JSON.stringify(j2) await fileService.writeFile(to, VSBuffer.fromString(jsonStr)) } @@ -145,8 +144,7 @@ class ExtensionTransferService extends Disposable implements IExtensionTransferS try { if (child.isDirectory) { // if is blacklisted - if (extensionBlacklist.find(bItem => child.resource.path.includes(bItem))) { - + if (isBlacklisted(child.resource.fsPath)) { console.log('Deleting extension', child.resource.fsPath) await fileService.del(child.resource, { recursive: true, useTrash: true }) } @@ -157,9 +155,7 @@ class ExtensionTransferService extends Disposable implements IExtensionTransferS try { const contentsStr = await fileService.readFile(child.resource) const json: any = JSON.parse(contentsStr.value.toString()) - const j2 = json.filter((entry: { identifier?: { id?: string } }) => - !extensionBlacklist.find(bItem => entry?.identifier?.id?.includes(bItem)) - ) + const j2 = json.filter((entry: { identifier?: { id?: string } }) => !isBlacklisted(entry?.identifier?.id)) const jsonStr = JSON.stringify(j2) await fileService.writeFile(child.resource, VSBuffer.fromString(jsonStr)) }