github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-10 06:35:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into better-anchors

Browse Source 
Conflicts:
	src/app/cursor.coffee
	src/app/editor.coffee
This commit is contained in:
Nathan Sobo
2013-01-30 12:59:04 -07:00
parent ec3a1a80cd f90d29262c
commit 113a8fa279
18 changed files with 470 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/buffer.coffee
View File

@@ -121,9 +121,9 @@ class Buffer
new Range([0, 0], [@getLastRow(), @getLastLine().length])
getTextInRange: (range) ->
range = Range.fromObject(range)
range = @clipRange(range)
if range.start.row == range.end.row
return @lines[range.start.row][range.start.column...range.end.column]
return @lineForRow(range.start.row)[range.start.column...range.end.column]
multipleLines = []
multipleLines.push @lineForRow(range.start.row)[range.start.column..] # first line
@@ -200,7 +200,7 @@ class Buffer
startPoint = [start, 0]
endPoint = [end + 1, 0]
@change(new Range(startPoint, endPoint), '')
@delete(new Range(startPoint, endPoint))
append: (text) ->
@insert(@getEofPosition(), text)
@@ -226,6 +226,10 @@ class Buffer
new Point(row, column)
clipRange: (range) ->
range = Range.fromObject(range)
new Range(@clipPosition(range.start), @clipPosition(range.end))
prefixAndSuffixForRange: (range) ->
prefix: @lines[range.start.row][0...range.start.column]
suffix: @lines[range.end.row][range.end.column..]