github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-04 11:45:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35

Browse Source
This commit is contained in:
Wliu
2015-11-19 20:20:24 -05:00
parent 9a850f9cb2 cad7406085
commit 577b85e76c
12 changed files with 93 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spec/text-editor-presenter-spec.coffee
View File

@@ -1704,6 +1704,18 @@ describe "TextEditorPresenter", ->
expectUndefinedStateForHighlight(presenter, highlight)
it "does not include highlights that end before the first visible row", ->
editor.setText("Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.")
editor.setSoftWrapped(true)
editor.setWidth(100, true)
editor.setDefaultCharWidth(10)
marker = editor.markBufferRange([[0, 0], [0, 4]], invalidate: 'never')
highlight = editor.decorateMarker(marker, type: 'highlight', class: 'a')
presenter = buildPresenter(explicitHeight: 30, scrollTop: 10, tileSize: 2)
expect(stateForHighlightInTile(presenter, highlight, 0)).toBeUndefined()
it "updates when ::scrollTop changes", ->
editor.setSelectedBufferRanges([
[[6, 2], [6, 4]],