Handle exceptions thrown by atom.workspace.scan()

This commit makes sure that async exceptions thrown are handled and displayed correctly in the find and replace UI
atom · May 22, 2019 · e2600aa · e2600aa
1 parent 04568a1
commit e2600aa
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/lib/project-find-view.js b/lib/project-find-view.js
@@ -318,7 +318,7 @@ class ProjectFindView {
     return searchPromise;
   }
 
-  search(options) {
+  async search(options) {
     // We always want to set the options passed in, even if we dont end up doing the search
     if (options == null) { options = {}; }
     this.model.getFindOptions().set(options);
@@ -330,13 +330,13 @@ class ProjectFindView {
     let {onlyRunIfActive, onlyRunIfChanged} = options;
     if ((onlyRunIfActive && !this.model.active) || !findPattern) return Promise.resolve();
 
-    return this.showResultPane().then(() => {
-      try {
-        return this.model.search(findPattern, pathsPattern, replacePattern, options);
-      } catch (e) {
-        this.setErrorMessage(e.message);
-      }
-    });
+    await this.showResultPane()
+
+    try {
+      return await this.model.search(findPattern, pathsPattern, replacePattern, options);
+    } catch (e) {
+      this.setErrorMessage(e.message);
+    }
   }
 
   replaceAll() {

diff --git a/lib/project/results-model.js b/lib/project/results-model.js
@@ -187,7 +187,7 @@ module.exports = class ResultsModel {
     )
   }
 
-  search (findPattern, pathsPattern, replacePattern, options = {}) {
+  async search (findPattern, pathsPattern, replacePattern, options = {}) {
     if (!this.shouldRerunSearch(findPattern, pathsPattern, options)) {
       this.emitter.emit('did-noop-search')
       return Promise.resolve()
@@ -236,17 +236,18 @@ module.exports = class ResultsModel {
       })
 
     this.emitter.emit('did-start-searching', this.inProgressSearchPromise)
-    return this.inProgressSearchPromise.then(message => {
-      if (message === 'cancelled') {
-        this.emitter.emit('did-cancel-searching')
-      } else {
-        const resultsSummary = this.getResultsSummary()
 
-        this.metricsReporter.sendSearchEvent(Date.now() - startTime, resultsSummary.matchCount)
-        this.inProgressSearchPromise = null
-        this.emitter.emit('did-finish-searching', resultsSummary)
-      }
-    })
+    const message = await this.inProgressSearchPromise
+
+    if (message === 'cancelled') {
+      this.emitter.emit('did-cancel-searching')
+    } else {
+      const resultsSummary = this.getResultsSummary()
+
+      this.metricsReporter.sendSearchEvent(Date.now() - startTime, resultsSummary.matchCount)
+      this.inProgressSearchPromise = null
+      this.emitter.emit('did-finish-searching', resultsSummary)
+    }
   }
 
   replace (pathsPattern, replacePattern, replacementPaths) {