Feb 14, 2021 · Feb 13, 2021 · Feb 13, 2021 · Feb 13, 2021 · Feb 13, 2021 · Feb 14, 2021
diff --git a/lib/views/directory-select.js b/lib/views/directory-select.js
    );
  }

  chooseDirectory =() => new Promise(resolve => {
    this.props.showOpenDialog(this.props.currentWindow, {
  chooseDirectory =async () => {
 const {filePaths} = awaitthis.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]);
    }
  }
 }
diff --git a/lib/views/git-timings-view.js b/lib/views/git-timings-view.js
    const buffer = new TextBuffer({text: json});
    dialog.showSaveDialog({
      defaultPath: 'git-timings.json',
    }, filename => {
      if (!filename) { return; }
      buffer.saveAs(filename);
    }).then(({filePath}) => {
      if (!filePath) { return; }
      buffer.saveAs(filePath);
    });
  }
 }
    e.preventDefault();
    dialog.showOpenDialog({
      properties: ['openFile'],
    },asyncfilenames => {
      if (!filenames) { return; }
      const filename =filenames[0];
    }).then(async({filePaths}) => {
      if (!filePaths.length) { return; }
      const filename =filePaths[0];
      try {
        const contents = await fs.readFile(filename, {encoding: 'utf8'});
        const data = JSON.parse(contents);
diff --git a/test/views/directory-select.test.js b/test/views/directory-select.test.js
      <DirectorySelect
        currentWindow={atomEnv.getCurrentWindow()}
        buffer={buffer}
        showOpenDialog={() =>{}}
        showOpenDialog={() =>Promise.resolve()}
        tabGroup={new TabGroup()}
        {...override}
      />

  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}));
    });

    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}));
diff --git a/test/worker-manager.test.js b/test/worker-manager.test.js
      });
      `;

      awaitnew Promise(resolve =>browserWindow.webContents.executeJavaScript(script, resolve));
      await browserWindow.webContents.executeJavaScript(script);

      workerManager.destroy(true);
      workerManager = new WorkerManager();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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} = awaitthis.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]);
		}
		}
Copy link Contributor smashwilsonFeb 14, 2021 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. 👍 Perfect!
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -328,9 +328,9 @@ class WaterfallWidget extends React.Component {
		const buffer = new TextBuffer({text: json});
		dialog.showSaveDialog({
		defaultPath: 'git-timings.json',
		}, filename => {
		if (!filename) { return; }
		buffer.saveAs(filename);
		}).then(({filePath}) => {
		if (!filePath) { return; }
		buffer.saveAs(filePath);
Copy link Contributor smashwilsonFeb 14, 2021 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Can we use async/await here too?
		});
		}
		}
Expand DownExpand Up		@@ -423,9 +423,9 @@ export default class GitTimingsView extends React.Component {
		e.preventDefault();
		dialog.showOpenDialog({
		properties: ['openFile'],
		},asyncfilenames => {
		if (!filenames) { return; }
		const filename =filenames[0];
		}).then(async({filePaths}) => {
Copy link Contributor smashwilsonFeb 14, 2021 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. And here ☝🏻 Sorry, should have clarified that I meant at all three callsites on the first review 👀 Copy link ContributorAuthor astururFeb 14, 2021 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. oh ok no issue, i can convert them, i m still here.
		if (!filePaths.length) { return; }
		const filename =filePaths[0];
		try {
		const contents = await fs.readFile(filename, {encoding: 'utf8'});
		const data = JSON.parse(contents);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,7 +24,7 @@ describe('DirectorySelect', function() {
		<DirectorySelect
		currentWindow={atomEnv.getCurrentWindow()}
		buffer={buffer}
		showOpenDialog={() =>{}}
		showOpenDialog={() =>Promise.resolve()}
		tabGroup={new TabGroup()}
		{...override}
		/>
Expand All		@@ -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']}));
Copy link Contributor smashwilsonFeb 14, 2021 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. 👍 Perfect.
		const buffer = new TextBuffer({text: '/original'});

		const wrapper = shallow(buildApp({showOpenDialog, buffer}));
Expand All		@@ -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}));
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -167,7 +167,7 @@ describe('WorkerManager', function() {
		});
		`;

		awaitnew Promise(resolve =>browserWindow.webContents.executeJavaScript(script, resolve));
		await browserWindow.webContents.executeJavaScript(script);
Copy link Contributor smashwilsonFeb 14, 2021 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. 🙇🏻

		workerManager.destroy(true);
		workerManager = new WorkerManager();
Expand Down