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 pull request #2727 from atom/bo-subscribe-to-marker-changes

Browse Source 
Subscribe to marker changes
This commit is contained in:
Ben Ogle
2014-06-24 11:15:47 -07:00
parent daaf9be4bf 5ebb17c2e8
commit b7d8e581ee
4 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
spec/editor-component-spec.coffee
View File

@@ -991,18 +991,6 @@ describe "EditorComponent", ->
nextTick()
expect(node.querySelectorAll('.test-highlight').length).toBe 0
it "moves rendered highlights when the marker moves", ->
regionStyle = node.querySelector('.test-highlight .region').style
originalTop = parseInt(regionStyle.top)
editor.getBuffer().insert([0, 0], '\n')
nextTick()
regionStyle = node.querySelector('.test-highlight .region').style
newTop = parseInt(regionStyle.top)
expect(newTop).toBe originalTop + lineHeightInPixels
it "removes highlights when a decoration's marker is destroyed", ->
marker.destroy()
nextTick()
@@ -1024,6 +1012,29 @@ describe "EditorComponent", ->
regions = node.querySelectorAll('.test-highlight .region')
expect(regions.length).toBe 2
describe "when a decoration's marker moves", ->
it "moves rendered highlights when the buffer is changed", ->
regionStyle = node.querySelector('.test-highlight .region').style
originalTop = parseInt(regionStyle.top)
editor.getBuffer().insert([0, 0], '\n')
nextTick()
regionStyle = node.querySelector('.test-highlight .region').style
newTop = parseInt(regionStyle.top)
expect(newTop).toBe originalTop + lineHeightInPixels
it "moves rendered highlights when the marker is manually moved", ->
regionStyle = node.querySelector('.test-highlight .region').style
expect(parseInt(regionStyle.top)).toBe 2 * lineHeightInPixels
marker.setBufferRange([[5, 8], [5, 13]])
nextTick()
regionStyle = node.querySelector('.test-highlight .region').style
expect(parseInt(regionStyle.top)).toBe 5 * lineHeightInPixels
describe "hidden input field", ->
it "renders the hidden input field at the position of the last cursor if the cursor is on screen and the editor is focused", ->
editor.setVerticalScrollMargin(0)