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

Don’t use atom.grammars global in TokenizedBuffer

Browse Source
This commit is contained in:
Nathan Sobo
2015-10-03 11:13:38 -06:00
parent 4f65452902
commit b2359f44a6
10 changed files with 80 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/workspace.coffee
View File

@@ -28,7 +28,8 @@ class Workspace extends Model
{
@packageManager, @config, @project, @grammarRegistry, @notificationManager,
@clipboard, @viewRegistry, @setRepresentedFilename, @setDocumentEdited, @assert
@clipboard, @viewRegistry, @grammarRegistry, @setRepresentedFilename,
@setDocumentEdited, @assert
} = params
debugger unless @assert?
@@ -460,7 +461,11 @@ class Workspace extends Model
@buildTextEditor(_.extend({buffer, largeFileMode}, options))
buildTextEditor: (params) ->
new TextEditor(_.extend({@config, @notificationManager, @clipboard, @viewRegistry, @project, @assert}, params))
params = _.extend({
@config, @notificationManager, @clipboard, @viewRegistry, @grammarRegistry,
@project, @assert
}, params)
new TextEditor(params)
# Public: Asynchronously reopens the last-closed item's URI if it hasn't already been
# reopened.