feat(patches): remove file from patch

Author: dsanders11

package.json

@@ -162,6 +162,11 @@
         "title": "Remove Patch",
         "category": "Electron Build Tools"
       },
+      {
+        "command": "electron-build-tools.patches.removeFileFromPatch",
+        "title": "Remove File from Patch",
+        "category": "Electron Build Tools"
+      },
       {
         "command": "electron-build-tools.patches.search",
         "title": "Search Patches",
@@ -732,6 +737,10 @@
           "command": "electron-build-tools.patches.remove",
           "when": "false"
         },
+        {
+          "command": "electron-build-tools.patches.removeFileFromPatch",
+          "when": "false"
+        },
         {
           "command": "electron-build-tools.patches.search",
           "when": "electron-build-tools:active"
@@ -868,6 +877,11 @@
           "when": "view == electron-build-tools:patches && viewItem == patch",
           "group": "7_modification"
         },
+        {
+          "command": "electron-build-tools.patches.removeFileFromPatch",
+          "when": "view == electron-build-tools:patches && viewItem == file-in-patch",
+          "group": "1_modification"
+        },
         {
           "command": "electron-build-tools.removeConfig",
           "when": "view == electron-build-tools:configs && viewItem =~ /^active-config$|^config$/"

src/commands/patches.ts

@@ -174,6 +174,16 @@ export function registerPatchesCommands(
         );
       },
     ),
+    vscode.commands.registerCommand(
+      `${commandPrefix}.patches.removeFileFromPatch`,
+      (patchFileTreeItem: FileInPatchTreeItem) => {
+        const uri = patchFileTreeItem.resourceUri.with({
+          scheme: virtualPatchFsScheme,
+        });
+
+        return vscode.workspace.fs.delete(uri);
+      },
+    ),
     vscode.commands.registerCommand(
       `${commandPrefix}.removePullRequestPatch`,
       (treeItem: PullRequestTreeItem) => {

src/fileSystemProvider.ts

@@ -59,7 +59,7 @@ export class ElectronFileSystemProvider implements vscode.FileSystemProvider {
     throw new vscode.FileSystemError("Method not implemented.");
   }
 
-  delete(): void {
+  delete(_uri: vscode.Uri): void {
     throw new vscode.FileSystemError("Method not implemented.");
   }
 
@@ -73,6 +73,26 @@ export class ElectronPatchFileSystemProvider extends ElectronFileSystemProvider
     super();
   }
 
+  async delete(uri: vscode.Uri): Promise<void> {
+    const queryParams = new URLSearchParams(uri.query);
+    const patchFileUri = vscode.Uri.parse(queryParams.get("patch")!, true);
+
+    const patchDirectory = vscode.Uri.file(path.dirname(patchFileUri.fsPath));
+    const cwd =
+      await this.patchesProvider.getCheckoutDirectoryForPatchDirectory(
+        patchDirectory,
+      );
+
+    // Update the file so that its start and end blob IDs are the same,
+    // which will result in an empty diff and the file removed from the patch
+    await this.updateFileInPatch(
+      patchFileUri,
+      uri,
+      cwd,
+      queryParams.get("blobIdA")!,
+    );
+  }
+
   async writeFile(uri: vscode.Uri, content: Uint8Array): Promise<void> {
     const queryParams = new URLSearchParams(uri.query);
     const patchFileUri = vscode.Uri.parse(queryParams.get("patch")!, true);
@@ -88,6 +108,15 @@ export class ElectronPatchFileSystemProvider extends ElectronFileSystemProvider
       Buffer.from(content).toString("utf8"),
     );
 
+    await this.updateFileInPatch(patchFileUri, uri, cwd, newBlobId);
+  }
+
+  private async updateFileInPatch(
+    patchFileUri: vscode.Uri,
+    uri: vscode.Uri,
+    cwd: vscode.Uri,
+    newBlobId: string,
+  ) {
     // Parse the existing patch file to get the metadata
     const patchContents = (
       await vscode.workspace.fs.readFile(patchFileUri)