From 6e2674c4a0f92ac91a17576f042d64f64281701d Mon Sep 17 00:00:00 2001
From: Andrew Dupont <github@andrewdupont.net>
Date: Mon, 4 Nov 2024 16:13:20 -0800
Subject: [PATCH] =?UTF-8?q?Revert=20removal=20of=20`shell.moveItemToTrash`?=
 =?UTF-8?q?=E2=80=A6=20(#1125)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Revert removal of `shell.moveItemToTrash`…

…since it doesn’t work in Electron 12 on Windows.

(Seems to work fine in Electron 30, so we'll just wait until the upgrade to migrate this usage.)

* Revert spec
---
 packages/tree-view/lib/tree-view.js           | 47 ++++++-------------
 .../tree-view/spec/tree-view-package-spec.js  |  4 +-
 2 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/packages/tree-view/lib/tree-view.js b/packages/tree-view/lib/tree-view.js
index dfd90013e7..2fdc4b4071 100644
--- a/packages/tree-view/lib/tree-view.js
+++ b/packages/tree-view/lib/tree-view.js
@@ -874,7 +874,7 @@ class TreeView {
     return dialog.attach();
   }
 
-  async removeSelectedEntries() {
+  removeSelectedEntries() {
     let activePath = this.getActivePath();
     let selectedPaths, selectedEntries;
     if (this.hasFocus()) {
@@ -896,25 +896,13 @@ class TreeView {
       }
     }
 
-    atom.confirm({
+    return atom.confirm({
       message: `Are you sure you want to delete the selected ${selectedPaths.length > 1 ? 'items' : 'item'}?`,
       detailedMessage: `You are deleting:\n${selectedPaths.join('\n')}`,
       buttons: ['Move to Trash', 'Cancel']
-    }, async (response) => {
+    }, (response) => {
       if (response === 0) { // Move to Trash
         let failedDeletions = [];
-        let deletionPromises = [];
-
-        // Since this goes async, all entries that correspond to paths we're
-        // about to delete will soon detach from the tree. So we should figure
-        // out ahead of time which element we're going to select when we're
-        // done.
-        let newSelectedEntry;
-        let firstSelectedEntry = selectedEntries[0];
-        if (firstSelectedEntry) {
-          newSelectedEntry = firstSelectedEntry.closest('.directory:not(.selected)');
-        }
-
         for (let selectedPath of selectedPaths) {
           // Don't delete entries which no longer exist. This can happen, for
           // example, when
@@ -925,24 +913,17 @@ class TreeView {
           //   but the parent folder is deleted first.
           if (!fs.existsSync(selectedPath)) continue;
 
-          let meta = { pathToDelete: selectedPath };
-
-          this.emitter.emit('will-delete-entry', meta);
+          this.emitter.emit('will-delete-entry', { pathToDelete: selectedPath });
 
-          let promise = shell.trashItem(selectedPath).then(() => {
-            this.emitter.emit('entry-deleted', meta);
-          }).catch(() => {
-            this.emitter.emit('delete-entry-failed', meta);
+          // TODO: `shell.trashItem` is the favored way to do this.
+          if (shell.moveItemToTrash(selectedPath)) {
+            this.emitter.emit('entry-deleted', { pathToDelete: selectedPath });
+          } else {
+            this.emitter.emit('delete-entry-failed', { pathToDelete: selectedPath });
             failedDeletions.push(selectedPath);
-          }).finally(() => {
-            repoForPath(selectedPath)?.getPathStatus(selectedPath);
-          });
-
-          deletionPromises.push(promise);
+          }
+          repoForPath(selectedPath)?.getPathStatus(selectedPath);
         }
-
-        await Promise.allSettled(deletionPromises);
-
         if (failedDeletions.length > 0) {
           atom.notifications.addError(
             this.formatTrashFailureMessage(failedDeletions),
@@ -953,9 +934,9 @@ class TreeView {
             }
           );
         }
-
-        if (newSelectedEntry) {
-          this.selectEntry(newSelectedEntry);
+        let firstSelectedEntry = selectedEntries[0];
+        if (firstSelectedEntry) {
+          this.selectEntry(firstSelectedEntry.closest('.directory:not(.selected)'));
         }
 
         if (atom.config.get('tree-view.squashDirectoryNames')) {
diff --git a/packages/tree-view/spec/tree-view-package-spec.js b/packages/tree-view/spec/tree-view-package-spec.js
index 8a8c97bbca..e718700401 100644
--- a/packages/tree-view/spec/tree-view-package-spec.js
+++ b/packages/tree-view/spec/tree-view-package-spec.js
@@ -3042,9 +3042,7 @@ describe("TreeView", function () {
         fileView.dispatchEvent(new MouseEvent('click', {bubbles: true, detail: 1}));
         treeView.focus();
 
-        spyOn(shell, 'trashItem').andCallFake(() => {
-          return Promise.reject(false);
-        })
+        spyOn(shell, 'moveItemToTrash').andReturn(false);
 
         spyOn(atom, 'confirm').andCallFake((options, callback) => callback(0));