github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-21 04:48:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2676 from atom/bo-cursor-gutter

Browse Source 
Don’t render decorations on the last empty line when selection not empty
This commit is contained in:
Ben Ogle
2014-06-19 15:10:18 -07:00
parent 184068dc55 520ece4b13
commit 85abed2406
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -439,7 +439,7 @@ describe "EditorComponent", ->
expect(lineNumberHasClass(10, 'cursor-line')).toBe false
it "adds cursor-line decorations to multiple lines when a selection is performed", ->
cursor.setScreenPosition([1, 0])
cursor.setScreenPosition([1, 5])
editor.selectDown(2)
expect(lineNumberHasClass(0, 'cursor-line')).toBe false
expect(lineNumberHasClass(1, 'cursor-line')).toBe true
@@ -447,10 +447,18 @@ describe "EditorComponent", ->
expect(lineNumberHasClass(3, 'cursor-line')).toBe true
expect(lineNumberHasClass(4, 'cursor-line')).toBe false
it "does not render a cursor-line decoration for the last line of a multi-line selection of the selection ends at column 0", ->
cursor.setScreenPosition([1, 0])
editor.selectDown(2)
expect(lineNumberHasClass(0, 'cursor-line')).toBe false
expect(lineNumberHasClass(1, 'cursor-line')).toBe true
expect(lineNumberHasClass(2, 'cursor-line')).toBe true
expect(lineNumberHasClass(3, 'cursor-line')).toBe false
describe "when decorations are applied to markers", ->
{marker, decoration} = {}
beforeEach ->
marker = editor.displayBuffer.markBufferRange([[2, 13], [3, 15]], class: 'my-marker', invalidate: 'inside')
marker = editor.displayBuffer.markBufferRange([[2, 13], [3, 15]], invalidate: 'inside')
decoration = {type: 'gutter', class: 'someclass'}
editor.addDecorationForMarker(marker, decoration)
waitsFor -> not component.decorationChangedImmediate?

6
src/editor-component.coffee
View File

@@ -236,9 +236,13 @@ EditorComponent = React.createClass
for decoration in decorations
if editor.decorationMatchesType(decoration, 'gutter') or editor.decorationMatchesType(decoration, 'line')
screenRange ?= marker.getScreenRange()
for screenRow in [screenRange.start.row..screenRange.end.row]
startRow = screenRange.start.row
endRow = screenRange.end.row
endRow-- if not screenRange.isEmpty() and screenRange.end.column == 0
for screenRow in [startRow..endRow]
decorationsByScreenRow[screenRow] ?= []
decorationsByScreenRow[screenRow].push decoration
decorationsByScreenRow
getHighlightDecorations: (decorationsByMarkerId) ->