Fix maintenance of grammars for copied editors

This commit is contained in:
Max Brunsfeld
2016-08-08 11:07:14 -07:00
parent 1f34a8950a
commit ee2e18737e
6 changed files with 25 additions and 15 deletions

View File

@@ -156,7 +156,7 @@ class TextEditor extends Model
@buffer ?= new TextBuffer
@tokenizedBuffer ?= new TokenizedBuffer({
@tabLength, @buffer, @largeFileMode, @assert
grammar, @tabLength, @buffer, @largeFileMode, @assert
})
@displayLayer ?= @buffer.addDisplayLayer()
@displayLayer.setTextDecorationLayer(@tokenizedBuffer)
@@ -187,9 +187,6 @@ class TextEditor extends Model
priority: 0
visible: lineNumberGutterVisible
if grammar?
@setGrammar(grammar)
serialize: ->
tokenizedBufferState = @tokenizedBuffer.serialize()
@@ -557,13 +554,12 @@ class TextEditor extends Model
displayLayer = @displayLayer.copy()
selectionsMarkerLayer = displayLayer.getMarkerLayer(@buffer.getMarkerLayer(@selectionsMarkerLayer.id).copy().id)
softTabs = @getSoftTabs()
newEditor = new TextEditor({
new TextEditor({
@buffer, selectionsMarkerLayer, @tabLength, softTabs,
suppressCursorCreation: true,
@firstVisibleScreenRow, @firstVisibleScreenColumn,
@clipboard, @assert, displayLayer
@clipboard, @assert, displayLayer, grammar: @getGrammar()
})
newEditor
# Controls visibility based on the given {Boolean}.
setVisible: (visible) -> @tokenizedBuffer.setVisible(visible)