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

🚱 Fix leak in Workspace::buildTextEditor

Browse Source
This commit is contained in:
Max Brunsfeld
2016-08-10 13:57:04 -07:00
parent 6d4e0f9b0a
commit ea50d4fe8c
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/workspace.coffee
View File

@@ -561,10 +561,10 @@ class Workspace extends Model
throw error
@project.bufferForPath(filePath, options).then (buffer) =>
editor = @buildTextEditor(Object.assign({buffer, largeFileMode}, options))
disposable = atom.textEditors.add(editor)
editor.onDidDestroy -> disposable.dispose()
editor
new TextEditor(Object.assign(
{@clipboard, @assert, buffer, largeFileMode},
options
))
handleGrammarUsed: (grammar) ->
return unless grammar?
@@ -581,10 +581,12 @@ class Workspace extends Model
#
# Returns a {TextEditor}.
buildTextEditor: (params) ->
params = Object.assign({@clipboard, @assert}, params)
editor = new TextEditor(params)
@textEditorRegistry.maintainConfig(editor)
@textEditorRegistry.maintainGrammar(editor)
editor = new TextEditor(Object.assign({@clipboard, @assert}, params))
subscriptions = new CompositeDisposable(
@textEditorRegistry.maintainConfig(editor),
@textEditorRegistry.maintainGrammar(editor)
)
editor.onDidDestroy -> subscriptions.dispose()
editor
# Public: Asynchronously reopens the last-closed item's URI if it hasn't already been