Use electron.remote.shell instead of electron.shell

pulsar-edit · Dec 16, 2024 · 606b931 · 606b931
1 parent a5fccfc
commit 606b931
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/packages/tree-view/lib/tree-view.js b/packages/tree-view/lib/tree-view.js
@@ -1,5 +1,6 @@
 const path = require('path');
 const shell = require('electron').shell;
+const remoteShell = require('electron').remote.shell;
 const _ = require('underscore-plus');
 const fs = require('fs-plus');
 const { CompositeDisposable, Emitter } = require('atom');
@@ -822,7 +823,7 @@ class TreeView {
         `Unable to show ${filePath} in ${this.getFileManagerName()}`
       );
     }
-    return shell.showItemInFolder(filePath);
+    return remoteShell.showItemInFolder(filePath);
   }
 
   showCurrentFileInFileManager() {
@@ -834,7 +835,7 @@ class TreeView {
         `Unable to show ${filePath} in ${this.getFileManagerName()}`
       );
     }
-    return shell.showItemInFolder(filePath);
+    return remoteShell.showItemInFolder(filePath);
   }
 
   getFileManagerName() {

diff --git a/packages/tree-view/spec/tree-view-package-spec.js b/packages/tree-view/spec/tree-view-package-spec.js
@@ -5,6 +5,7 @@ const path = require('path');
 const temp = require('temp').track();
 const os = require('os');
 const {remote, shell} = require('electron');
+const remoteShell = require('electron').remote.shell;
 const Directory = require('../lib/directory');
 const eventHelpers = require("./event-helpers");
 
@@ -4133,17 +4134,17 @@ describe("TreeView", function () {
   });
 
   describe("showSelectedEntryInFileManager()", function () {
-    beforeEach(() => spyOn(shell, 'showItemInFolder').andReturn(false));
+    beforeEach(() => spyOn(remoteShell, 'showItemInFolder').andReturn(false));
 
     it("does nothing if no entry is selected", function () {
       treeView.deselect();
       treeView.showSelectedEntryInFileManager();
-      expect(shell.showItemInFolder).not.toHaveBeenCalled();
+      expect(remoteShell.showItemInFolder).not.toHaveBeenCalled();
     });
 
     it("shows the selected entry in the OS's file manager", function () {
       treeView.showSelectedEntryInFileManager();
-      expect(shell.showItemInFolder).toHaveBeenCalled();
+      expect(remoteShell.showItemInFolder).toHaveBeenCalled();
     });
 
     it("displays a notification if showing the file fails", function () {
@@ -4155,13 +4156,13 @@ describe("TreeView", function () {
   });
 
   describe("showCurrentFileInFileManager()", function () {
-    beforeEach(() => spyOn(shell, 'showItemInFolder').andReturn(false));
+    beforeEach(() => spyOn(remoteShell, 'showItemInFolder').andReturn(false));
 
     it("does nothing when no file is opened", function () {
       expect(atom.workspace.getCenter().getPaneItems().length).toBe(0);
 
       treeView.showCurrentFileInFileManager();
-      expect(shell.showItemInFolder).not.toHaveBeenCalled();
+      expect(remoteShell.showItemInFolder).not.toHaveBeenCalled();
     });
 
     it("does nothing when only an untitled tab is opened", function () {
@@ -4170,7 +4171,7 @@ describe("TreeView", function () {
       return runs(function () {
         workspaceElement.focus();
         treeView.showCurrentFileInFileManager();
-        expect(shell.showItemInFolder).not.toHaveBeenCalled();
+        expect(remoteShell.showItemInFolder).not.toHaveBeenCalled();
       });
     });
 
@@ -4181,7 +4182,7 @@ describe("TreeView", function () {
 
       return runs(function () {
         treeView.showCurrentFileInFileManager();
-        expect(shell.showItemInFolder).toHaveBeenCalled();
+        expect(remoteShell.showItemInFolder).toHaveBeenCalled();
       });
     });