mirror of
https://github.com/atom/atom.git
synced 2026-02-09 06:05:11 -05:00
Replace Editor.setBuffer with Editor.edit
This commit is contained in:
@@ -72,7 +72,8 @@ class Editor extends View
|
||||
@editSessions = []
|
||||
|
||||
if editSession?
|
||||
@setActiveEditSession(editSession)
|
||||
@editSessions.push editSession
|
||||
@setActiveEditSessionIndex(0)
|
||||
else if @mini
|
||||
editSession = new EditSession
|
||||
softWrapColumn: @calcSoftWrapColumn()
|
||||
@@ -81,7 +82,8 @@ class Editor extends View
|
||||
autoIndent: @autoIndent
|
||||
softTabs: @softTabs
|
||||
|
||||
@setActiveEditSession(editSession)
|
||||
@editSessions.push editSession
|
||||
@setActiveEditSessionIndex(0)
|
||||
else
|
||||
throw new Error("Editor initialization requires an editSession")
|
||||
|
||||
@@ -348,37 +350,15 @@ class Editor extends View
|
||||
|
||||
@trigger 'editor-open', [this]
|
||||
|
||||
setBuffer: (buffer) ->
|
||||
@activateEditSessionForBuffer(buffer)
|
||||
edit: (editSession) ->
|
||||
index = @editSessions.indexOf(editSession)
|
||||
|
||||
setActiveEditSession: (editSession) ->
|
||||
index = @editSessionIndexForBuffer(editSession.buffer)
|
||||
|
||||
unless index?
|
||||
if index == -1
|
||||
index = @editSessions.length
|
||||
@editSessions.push(editSession)
|
||||
|
||||
@setActiveEditSessionIndex(index)
|
||||
|
||||
activateEditSessionForBuffer: (buffer) ->
|
||||
index = @editSessionIndexForBuffer(buffer)
|
||||
unless index?
|
||||
index = @editSessions.length
|
||||
@editSessions.push(new EditSession(
|
||||
softWrapColumn: @calcSoftWrapColumn()
|
||||
buffer: buffer
|
||||
tabText: @tabText
|
||||
autoIndent: @autoIndent
|
||||
softTabs: @softTabs
|
||||
))
|
||||
|
||||
@setActiveEditSessionIndex(index)
|
||||
|
||||
editSessionIndexForBuffer: (buffer) ->
|
||||
for editSession, index in @editSessions
|
||||
return index if editSession.buffer == buffer
|
||||
null
|
||||
|
||||
removeActiveEditSession: ->
|
||||
if @editSessions.length == 1
|
||||
@remove()
|
||||
@@ -411,6 +391,7 @@ class Editor extends View
|
||||
@unsubscribeFromBuffer() if @buffer
|
||||
@buffer = @activeEditSession.buffer
|
||||
@buffer.on "path-change.editor#{@id}", => @trigger 'editor-path-change'
|
||||
|
||||
@trigger 'editor-path-change'
|
||||
|
||||
@renderWhenAttached()
|
||||
|
||||
@@ -94,7 +94,7 @@ class RootView extends View
|
||||
editSession = @project.open(path)
|
||||
|
||||
if @activeEditor()
|
||||
@activeEditor().setActiveEditSession(editSession)
|
||||
@activeEditor().edit(editSession)
|
||||
else
|
||||
editor = new Editor(editSession: editSession)
|
||||
pane = new Pane(editor)
|
||||
|
||||
Reference in New Issue
Block a user