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

WIP: Removing lines that are no longer visible

Browse Source
This commit is contained in:
Corey Johnson & Nathan Sobo
2012-05-10 12:08:58 -07:00
parent 3f8654c76d
commit c5d2616155
2 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
spec/app/editor-spec.coffee
View File

@@ -392,7 +392,7 @@ describe "Editor", ->
otherEditor.simulateDomAttachment()
expect(otherEditor.setMaxLineLength).toHaveBeenCalled()
describe "when some lines at the end of the buffer are not visible on screen", ->
describe "when some lines at the end of the buffer are not visible on screen when the editor is attached", ->
beforeEach ->
editor.attachToDom(heightInLines: 5.5)
@@ -401,21 +401,37 @@ describe "Editor", ->
expectedMarginBottom = (buffer.numLines() - 6) * editor.lineHeight
expect(editor.lines.find('.line:last').css('margin-bottom')).toBe "#{expectedMarginBottom}px"
it "renders additional lines when the editor is scrolled down, adjusting margins appropriately", ->
fit "when the lines are scrolled down, removes lines that become invisible and build lines that are become visisble", ->
editor.scroller.scrollTop(editor.lineHeight * 2.5)
editor.scroller.trigger 'scroll'
expect(editor.lines.find('.line').length).toBe 8
expect(editor.lines.find('.line:first').text()).toBe buffer.lineForRow(0)
expect(editor.lines.find('.line').length).toBe 6
expect(editor.lines.find('.line:first').text()).toBe buffer.lineForRow(2)
expect(editor.lines.find('.line:last').text()).toBe buffer.lineForRow(7)
editor.scroller.scrollTop(editor.lineHeight * 3.5)
editor.scroller.trigger 'scroll'
expect(editor.lines.find('.line').length).toBe 6
expect(editor.lines.find('.line:first').text()).toBe buffer.lineForRow(3)
expect(editor.lines.find('.line:last').text()).toBe buffer.lineForRow(8)
it "adjusts margins to account for non-rendered lines", ->
editor.scroller.scrollTop(editor.lineHeight * 2.5)
editor.scroller.trigger 'scroll'
for line, index in editor.lines.find('.line')
marginTop = $(line).css('margin-top')
marginBottom = $(line).css('margin-bottom')
if index == 7
expectedMarginBottom = (buffer.numLines() - 8) * editor.lineHeight
if index == 0
expectedMarginTop = editor.lineHeight * 2
expect(marginTop).toBe "#{expectedMarginTop}px"
else if index == 5
expectedMarginBottom = (editor.getLastScreenRow() - 7) * editor.lineHeight
expect(marginBottom).toBe "#{expectedMarginBottom}px"
else
expect(marginBottom).toBe '0px'
expect(marginTop).toBe '0px'
it "renders additional lines when the editor is resized", ->
setEditorHeightInLines(editor, 10)
@@ -425,6 +441,16 @@ describe "Editor", ->
expect(editor.lines.find('.line:first').text()).toBe buffer.lineForRow(0)
expect(editor.lines.find('.line:last').text()).toBe buffer.lineForRow(9)
# describe "when lines at the beginning of the buffer are not visible on screen when the editor is attached", ->
# beforeEach ->
# editor.attachToDom(heightInLines: 5.5)
# it "only renders the visible lines, giving the first line a margin-top to account for the missing lines", ->
# expect(editor.lines.find('.line').length).toBe 6
# expectedMarginBottom = (buffer.numLines() - 6) * editor.lineHeight
# expect(editor.lines.find('.line:last').css('margin-bottom')).toBe "#{expectedMarginBottom}px"
describe "gutter rendering", ->
it "creates a line number element for each line in the buffer", ->
expect(editor.gutter.find('.line-number').length).toEqual(buffer.numLines())