github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-07 13:14:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into markers

Browse Source 
Conflicts:
	src/app/editor.coffee
This commit is contained in:
Kevin Sawicki & Nathan Sobo
2013-02-05 16:07:05 -07:00
parent 3dab8e92ee 3e84e9886c
commit 75e040b73b
45 changed files with 502 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/buffer.coffee
View File

@@ -218,13 +218,15 @@ class Buffer
range
clipPosition: (position) ->
{ row, column } = Point.fromObject(position)
row = 0 if row < 0
column = 0 if column < 0
row = Math.min(@getLastRow(), row)
column = Math.min(@lineLengthForRow(row), column)
new Point(row, column)
position = Point.fromObject(position)
eofPosition = @getEofPosition()
if position.isGreaterThan(eofPosition)
eofPosition
else
row = Math.max(position.row, 0)
column = Math.max(position.column, 0)
column = Math.min(@lineLengthForRow(row), column)
new Point(row, column)
clipRange: (range) ->
range = Range.fromObject(range)