Merge pull request #2626 from asturur/promisification

Update to promise api for some methods in the electron API

Author: smashwilson

lib/views/directory-select.js

@@ -45,15 +45,13 @@ export default class DirectorySelect extends React.Component {
     );
   }
 
-  chooseDirectory = () => new Promise(resolve => {
-    this.props.showOpenDialog(this.props.currentWindow, {
+  chooseDirectory = async () => {
+    const {filePaths} = await this.props.showOpenDialog(this.props.currentWindow, {
       defaultPath: this.props.buffer.getText(),
       properties: ['openDirectory', 'createDirectory', 'promptToCreate'],
-    }, filePaths => {
-      if (filePaths !== undefined) {
-        this.props.buffer.setText(filePaths[0]);
-      }
-      resolve();
     });
-  });
+    if (filePaths.length) {
+      this.props.buffer.setText(filePaths[0]);
+    }
+  }
 }

lib/views/git-timings-view.js

@@ -322,16 +322,17 @@ class WaterfallWidget extends React.Component {
     this.setState(s => ({collapsed: !s.collapsed}));
   }
 
-  handleExportClick(e) {
+  async handleExportClick(e) {
     e.preventDefault();
     const json = JSON.stringify(this.props.markers.map(m => m.serialize()), null, '  ');
     const buffer = new TextBuffer({text: json});
-    dialog.showSaveDialog({
+    const {filePath} = await dialog.showSaveDialog({
       defaultPath: 'git-timings.json',
-    }, filename => {
-      if (!filename) { return; }
-      buffer.saveAs(filename);
     });
+    if (!filePath) {
+      return;
+    }
+    buffer.saveAs(filePath);
   }
 }
 
@@ -419,22 +420,23 @@ export default class GitTimingsView extends React.Component {
     );
   }
 
-  handleImportClick(e) {
+  async handleImportClick(e) {
     e.preventDefault();
-    dialog.showOpenDialog({
+    const {filePaths} = await dialog.showOpenDialog({
       properties: ['openFile'],
-    }, async filenames => {
-      if (!filenames) { return; }
-      const filename = filenames[0];
-      try {
-        const contents = await fs.readFile(filename, {encoding: 'utf8'});
-        const data = JSON.parse(contents);
-        const restoredMarkers = data.map(item => Marker.deserialize(item));
-        GitTimingsView.restoreGroup(restoredMarkers);
-      } catch (_err) {
-        atom.notifications.addError(`Could not import timings from ${filename}`);
-      }
     });
+    if (!filePaths.length) {
+      return;
+    }
+    const filename = filePaths[0];
+    try {
+      const contents = await fs.readFile(filename, {encoding: 'utf8'});
+      const data = JSON.parse(contents);
+      const restoredMarkers = data.map(item => Marker.deserialize(item));
+      GitTimingsView.restoreGroup(restoredMarkers);
+    } catch (_err) {
+      atom.notifications.addError(`Could not import timings from ${filename}`);
+    }
   }
 
   serialize() {

test/views/directory-select.test.js

@@ -24,7 +24,7 @@ describe('DirectorySelect', function() {
       <DirectorySelect
         currentWindow={atomEnv.getCurrentWindow()}
         buffer={buffer}
-        showOpenDialog={() => {}}
+        showOpenDialog={() => Promise.resolve()}
         tabGroup={new TabGroup()}
         {...override}
       />
@@ -47,7 +47,7 @@ describe('DirectorySelect', function() {
 
   describe('clicking the directory button', function() {
     it('populates the destination path buffer on accept', async function() {
-      const showOpenDialog = sinon.stub().callsArgWith(2, ['/some/directory/path']);
+      const showOpenDialog = sinon.stub().returns(Promise.resolve({filePaths: ['/some/directory/path']}));
       const buffer = new TextBuffer({text: '/original'});
 
       const wrapper = shallow(buildApp({showOpenDialog, buffer}));
@@ -58,7 +58,7 @@ describe('DirectorySelect', function() {
     });
 
     it('leaves the destination path buffer unmodified on cancel', async function() {
-      const showOpenDialog = sinon.stub().callsArgWith(2, undefined);
+      const showOpenDialog = sinon.stub().returns(Promise.resolve({filePaths: []}));
       const buffer = new TextBuffer({text: '/original'});
 
       const wrapper = shallow(buildApp({showOpenDialog, buffer}));

test/worker-manager.test.js

@@ -167,7 +167,7 @@ describe('WorkerManager', function() {
       });
       `;
 
-      await new Promise(resolve => browserWindow.webContents.executeJavaScript(script, resolve));
+      await browserWindow.webContents.executeJavaScript(script);
 
       workerManager.destroy(true);
       workerManager = new WorkerManager();