github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-07 05:05:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow workspace item objects to be passed to Workspace.open

Browse Source
This commit is contained in:
Max Brunsfeld
2017-04-03 16:54:22 -07:00
committed by Nathan Sobo
parent 0e1bc58310
commit 1552854f3b
2 changed files with 59 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/workspace.js
View File

@@ -628,8 +628,14 @@ module.exports = class Workspace extends Model {
// should almost always be omitted to honor user preference.
//
// Returns a {Promise} that resolves to the {TextEditor} for the file URI.
async open (uri_, options = {}) {
const uri = this.project.resolvePath(uri_)
async open (itemOrURI, options = {}) {
let uri, item
if (typeof itemOrURI === 'string') {
uri = this.project.resolvePath(itemOrURI)
} else if (itemOrURI) {
item = itemOrURI
if (typeof item.getURI === 'function') uri = item.getURI()
}
if (!atom.config.get('core.allowPendingPaneItems')) {
options.pending = false
@@ -641,14 +647,14 @@ module.exports = class Workspace extends Model {
this.applicationDelegate.addRecentDocument(uri)
}
let container, pane, item
let container, pane
// Try to find an existing item with the given URI.
if (uri) {
// Try to find an existing item in the workspace.
if (item || uri) {
if (options.pane) {
pane = options.pane
} else if (options.searchAllPanes) {
pane = this.paneForURI(uri)
pane = item ? this.paneForItem(item) : this.paneForURI(uri)
} else {
// The `split` option affects where we search for the item.
pane = this.getActivePane()
@@ -668,7 +674,7 @@ module.exports = class Workspace extends Model {
}
}
if (pane) item = pane.itemForURI(uri)
if (pane && !item) item = pane.itemForURI(uri)
}
// If an item is already present, yield the event loop to ensure this method