github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ns-switch-to-display-layers

Browse Source 
# Conflicts:
#	src/display-buffer.coffee
#	src/text-editor.coffee
#	src/tokenized-buffer.coffee
This commit is contained in:
Antonio Scandurra
2016-04-27 18:16:03 +02:00
parent 5cfe97160d 3b204d404f
commit ce4b2fa810
13 changed files with 152 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tokenized-buffer.coffee
View File

@@ -30,14 +30,13 @@ class TokenizedBuffer extends Model
state.buffer = atomEnvironment.project.bufferForPathSync(state.bufferPath)
state.config = atomEnvironment.config
state.grammarRegistry = atomEnvironment.grammars
state.packageManager = atomEnvironment.packages
state.assert = atomEnvironment.assert
new this(state)
constructor: (params) ->
{
@buffer, @tabLength, @largeFileMode, @config,
@grammarRegistry, @packageManager, @assert, grammarScopeName
@grammarRegistry, @assert, grammarScopeName
} = params
@emitter = new Emitter
@@ -128,7 +127,7 @@ class TokenizedBuffer extends Model
@disposables.add(@configSubscriptions)
@retokenizeLines()
@packageManager.triggerActivationHook("#{grammar.packageName}:grammar-used")
@emitter.emit 'did-change-grammar', grammar
getGrammarSelectionContent: ->