github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 06:48:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Skip spec windows when finding an existing window to open paths

Browse Source
This commit is contained in:
Ash Wilson
2019-04-28 17:22:14 -04:00
parent e368d78d27
commit 896ebfd97d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main-process/atom-application.js
View File

@@ -866,6 +866,7 @@ class AtomApplication extends EventEmitter {
// Returns the {AtomWindow} for the given locations.
windowForLocations (locationsToOpen, devMode, safeMode) {
return this.getLastFocusedWindow(window =>
!window.isSpec &&
window.devMode === devMode &&
window.safeMode === safeMode &&
window.containsLocations(locationsToOpen)
@@ -1021,13 +1022,13 @@ class AtomApplication extends EventEmitter {
// focused window that matches the requested dev and safe modes.
if (!existingWindow && addToLastWindow) {
existingWindow = this.getLastFocusedWindow(win => {
return win.devMode === devMode && win.safeMode === safeMode
return !win.isSpec && win.devMode === devMode && win.safeMode === safeMode
})
}
// Fall back to the last focused window that has no project roots.
if (!existingWindow) {
existingWindow = this.getLastFocusedWindow(win => !win.hasProjectPaths())
existingWindow = this.getLastFocusedWindow(win => !win.isSpec && !win.hasProjectPaths())
}
// One last case: if *no* paths are directories, add to the last focused window.
@@ -1035,7 +1036,7 @@ class AtomApplication extends EventEmitter {
const noDirectories = locationsToOpen.every(location => !location.isDirectory)
if (noDirectories) {
existingWindow = this.getLastFocusedWindow(win => {
return win.devMode === devMode && win.safeMode === safeMode
return !win.isSpec && win.devMode === devMode && win.safeMode === safeMode
})
}
}