From e570f72d8660ace20168386e94cccf47ffd1dd87 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Thu, 3 Jan 2019 16:40:35 -0500 Subject: [PATCH] Remove path normalization responsibilities from AtomWindow --- src/main-process/atom-window.js | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/src/main-process/atom-window.js b/src/main-process/atom-window.js index a56679143..d7f480f16 100644 --- a/src/main-process/atom-window.js +++ b/src/main-process/atom-window.js @@ -23,9 +23,7 @@ class AtomWindow extends EventEmitter { this.devMode = settings.devMode this.resourcePath = settings.resourcePath - let {pathToOpen, locationsToOpen} = settings - if (!locationsToOpen && pathToOpen) locationsToOpen = [{pathToOpen}] - if (!locationsToOpen) locationsToOpen = [] + const locationsToOpen = settings.locationsToOpen || [] this.loadedPromise = new Promise(resolve => { this.resolveLoadedPromise = resolve }) this.closedPromise = new Promise(resolve => { this.resolveClosedPromise = resolve }) @@ -73,23 +71,7 @@ class AtomWindow extends EventEmitter { if (this.loadSettings.safeMode == null) this.loadSettings.safeMode = false if (this.loadSettings.clearWindowState == null) this.loadSettings.clearWindowState = false - if (!this.loadSettings.initialPaths) { - this.loadSettings.initialPaths = [] - for (const {pathToOpen, stat} of locationsToOpen) { - if (!pathToOpen) continue - if (stat && stat.isDirectory()) { - this.loadSettings.initialPaths.push(pathToOpen) - } else { - const parentDirectory = path.dirname(pathToOpen) - if (stat && stat.isFile() || fs.existsSync(parentDirectory)) { - this.loadSettings.initialPaths.push(parentDirectory) - } else { - this.loadSettings.initialPaths.push(pathToOpen) - } - } - } - } - + this.loadSettings.initialPaths = locationsToOpen.map(location => location.pathToOpen).filter(Boolean) this.loadSettings.initialPaths.sort() // Only send to the first non-spec window created