pulsar-edit/pulsar
1
1
Fork 0
mirror of https://github.com/pulsar-edit/pulsar.git synced 2024-11-10 18:24:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Highlighter resumes from last unchanged line's state

Browse Source 
This allows for new a new line inserted inside a comment to be
highlighted correctly, for example.
This commit is contained in:
Nathan Sobo 2012-02-03 11:19:43 -07:00
parent 2b6b4b1717
commit 94f7296999
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spec/atom/highlighter-spec.coffee
View File

@ -49,8 +49,15 @@ describe "Highlighter", ->
expect(changeHandler).toHaveBeenCalled()
[event] = changeHandler.argsForCall[0]
expect(event.preRange).toEqual new Range([2, 0], [6, buffer.getLine(6).length])
expect(event.postRange).toEqual new Range([2, 0], [6, buffer.getLine(6).length])
expect(event.preRange).toEqual new Range([2, 0], [5, buffer.getLine(5).length])
expect(event.postRange).toEqual new Range([2, 0], [5, buffer.getLine(5).length])
it "resumes highlighting with the state of the previous line", ->
buffer.insert([0, 0], '/*')
buffer.insert([5, 0], '*/')
buffer.insert([1, 0], 'var ')
expect(highlighter.tokensForRow(1)[0].type).toBe 'comment'
describe "when lines are both updated and removed", ->
it "updates tokens to reflect the removed lines", ->
@ -85,8 +92,8 @@ describe "Highlighter", ->
expect(changeHandler).toHaveBeenCalled()
[event] = changeHandler.argsForCall[0]
expect(event.preRange).toEqual new Range([2, 0], [6, buffer.getLine(5).length])
expect(event.postRange).toEqual new Range([2, 0], [5, buffer.getLine(5).length])
expect(event.preRange).toEqual new Range([2, 0], [5, buffer.getLine(4).length])
expect(event.postRange).toEqual new Range([2, 0], [4, buffer.getLine(4).length])
describe "when lines are both updated and inserted", ->
it "updates tokens to reflect the inserted lines", ->
@ -128,5 +135,5 @@ describe "Highlighter", ->
expect(changeHandler).toHaveBeenCalled()
[event] = changeHandler.argsForCall[0]
expect(event.preRange).toEqual new Range([2, 0], [6, buffer.getLine(8).length])
expect(event.postRange).toEqual new Range([2, 0], [8, buffer.getLine(8).length])
expect(event.preRange).toEqual new Range([2, 0], [5, buffer.getLine(7).length])
expect(event.postRange).toEqual new Range([2, 0], [7, buffer.getLine(7).length])

5
src/atom/highlighter.coffee
View File

@ -20,8 +20,9 @@ class Highlighter
postRange = e.postRange.copy()
previousState = @lines[preRange.end.row].state
newLines = @tokenizeRows('start', postRange.start.row, postRange.end.row)
@lines[preRange.start.row..preRange.end.row] = newLines
startState = @lines[postRange.start.row - 1]?.state or 'start'
@lines[preRange.start.row..preRange.end.row] =
@tokenizeRows(startState, postRange.start.row, postRange.end.row)
for row in [postRange.end.row...@buffer.lastRow()]
break if @lines[row].state == previousState