diff --git a/src/atom-environment.js b/src/atom-environment.js index 5f620d424..4e8aaec7e 100644 --- a/src/atom-environment.js +++ b/src/atom-environment.js @@ -1088,23 +1088,23 @@ class AtomEnvironment { buttons: [ '&Open in new window and recover state', '&Add to this window and discard state' - ]}, response => { - if (choice === 0) { - this.open({ - pathsToOpen: projectPaths.concat(filesToOpen), - newWindow: true, - devMode: this.inDevMode(), - safeMode: this.inSafeMode() - }) - resolveDiscardStatePromise(Promise.resolve(null)) - } else if (choice === 1) { - for (let selectedPath of projectPaths) { - this.project.addPath(selectedPath) - } - resolveDiscardStatePromise(Promise.all(filesToOpen.map(file => this.workspace.open(file)))) + ] + }, response => { + if (response === 0) { + this.open({ + pathsToOpen: projectPaths.concat(filesToOpen), + newWindow: true, + devMode: this.inDevMode(), + safeMode: this.inSafeMode() + }) + resolveDiscardStatePromise(Promise.resolve(null)) + } else if (response === 1) { + for (let selectedPath of projectPaths) { + this.project.addPath(selectedPath) } + resolveDiscardStatePromise(Promise.all(filesToOpen.map(file => this.workspace.open(file)))) } - ) + }) return discardStatePromise } diff --git a/src/workspace.js b/src/workspace.js index e2e7f6165..865f6c29a 100644 --- a/src/workspace.js +++ b/src/workspace.js @@ -1216,7 +1216,7 @@ module.exports = class Workspace extends Model { const largeFileMode = fileSize >= (2 * 1048576) // 2MB - let resolveConfirmFileOpenPromise, rejectConfirmFileOpenPromise = [] + let [resolveConfirmFileOpenPromise, rejectConfirmFileOpenPromise] = [] const confirmFileOpenPromise = new Promise((resolve, reject) => { resolveConfirmFileOpenPromise = resolve rejectConfirmFileOpenPromise = reject