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

Buffer positions inside folds translate to screen positions preceding fold placeholder

Browse Source
This commit is contained in:
Nathan Sobo
2012-02-22 11:15:15 -07:00
parent 8ef270f797
commit 2132b5f8f4
4 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spec/atom/line-folder-spec.coffee
View File

@@ -55,37 +55,38 @@ describe "LineFolder", ->
expect(line4.text).toBe ' while(items.length > 0) {...}...concat(sort(right));'
expect(line5.text).toBe ' };'
fdescribe "position translation", ->
describe "position translation", ->
describe "when there is single fold spanning multiple lines", ->
it "translates positions to account for folded lines and characters and the placeholder", ->
folder.fold(new Range([4, 29], [7, 4]))
# preceding fold: identity
expect(folder.screenPositionForBufferPosition([3, 0])).toEqual [3, 0]
expect(folder.screenPositionForBufferPosition([4, 0])).toEqual [4, 0]
expect(folder.screenPositionForBufferPosition([4, 29])).toEqual [4, 29]
# expect(folder.screenPositionForBufferPosition([3, 0])).toEqual [3, 0]
# expect(folder.screenPositionForBufferPosition([4, 0])).toEqual [4, 0]
# expect(folder.screenPositionForBufferPosition([4, 29])).toEqual [4, 29]
expect(folder.bufferPositionForScreenPosition([3, 0])).toEqual [3, 0]
expect(folder.bufferPositionForScreenPosition([4, 0])).toEqual [4, 0]
expect(folder.bufferPositionForScreenPosition([4, 29])).toEqual [4, 29]
# expect(folder.bufferPositionForScreenPosition([3, 0])).toEqual [3, 0]
# expect(folder.bufferPositionForScreenPosition([4, 0])).toEqual [4, 0]
# expect(folder.bufferPositionForScreenPosition([4, 29])).toEqual [4, 29]
# inside of fold: translate to the start of the fold
# expect(folder.screenPositionForBufferPosition([4, 30])).toEqual [4, 29]
console.log "!!!!!!!!!"
expect(folder.screenPositionForBufferPosition([4, 35])).toEqual [4, 29]
# expect(folder.screenPositionForBufferPosition([5, 5])).toEqual [4, 29]
# following fold, on last line of fold
expect(folder.screenPositionForBufferPosition([7, 4])).toEqual [4, 32]
expect(folder.screenPositionForBufferPosition([7, 7])).toEqual [4, 35]
# expect(folder.screenPositionForBufferPosition([7, 4])).toEqual [4, 32]
# expect(folder.screenPositionForBufferPosition([7, 7])).toEqual [4, 35]
expect(folder.bufferPositionForScreenPosition([4, 32])).toEqual [7, 4]
expect(folder.bufferPositionForScreenPosition([4, 35])).toEqual [7, 7]
# expect(folder.bufferPositionForScreenPosition([4, 32])).toEqual [7, 4]
# expect(folder.bufferPositionForScreenPosition([4, 35])).toEqual [7, 7]
# # following fold, subsequent line
expect(folder.screenPositionForBufferPosition([8, 0])).toEqual [5, 0]
expect(folder.screenPositionForBufferPosition([13, 13])).toEqual [10, 13]
# expect(folder.screenPositionForBufferPosition([8, 0])).toEqual [5, 0]
# expect(folder.screenPositionForBufferPosition([13, 13])).toEqual [10, 13]
expect(folder.bufferPositionForScreenPosition([5, 0])).toEqual [8, 0]
expect(folder.bufferPositionForScreenPosition([10, 13])).toEqual [13, 13]
# expect(folder.bufferPositionForScreenPosition([5, 0])).toEqual [8, 0]
# expect(folder.bufferPositionForScreenPosition([10, 13])).toEqual [13, 13]
describe "when there is a single fold spanning a single line", ->
it "translates positions to account for folded characters and the placeholder", ->

2
src/atom/line-folder.coffee
View File

@@ -33,7 +33,7 @@ class LineFolder
screenLine
buildFoldPlaceholder: (fold) ->
new ScreenLineFragment([{value: '...', type: 'fold-placeholder'}], '...', [0, 3], fold.range.toDelta())
new ScreenLineFragment([{value: '...', type: 'fold-placeholder'}], '...', [0, 3], fold.range.toDelta(), isAtomic: true)
foldsForBufferRow: (bufferRow) ->
@activeFolds[bufferRow] or []

6
src/atom/line-map.coffee
View File

@@ -117,12 +117,12 @@ class LineMap
nextDelta = bufferDelta.add(screenLine.bufferDelta)
break if nextDelta.toPoint().greaterThan(bufferPosition)
break if nextDelta.toPoint().isEqual(bufferPosition) and not eagerWrap
bufferDelta = nextDelta
screenDelta = screenDelta.add(screenLine.screenDelta)
columns = screenDelta.columns + (bufferPosition.column - bufferDelta.columns)
new Point(screenDelta.rows, columns)
remainingBufferColumns = bufferPosition.column - bufferDelta.columns
additionalScreenColumns = Math.min(remainingBufferColumns, screenLine.lengthForClipping())
new Point(screenDelta.rows, screenDelta.columns + additionalScreenColumns)
bufferPositionForScreenPosition: (screenPosition) ->
screenPosition = Point.fromObject(screenPosition)

8
src/atom/screen-line-fragment.coffee
View File

@@ -3,6 +3,8 @@ Delta = require 'delta'
module.exports =
class ScreenLineFragment
isAtomic: false
constructor: (@tokens, @text, screenDelta, bufferDelta, extraFields) ->
@screenDelta = Delta.fromObject(screenDelta)
@bufferDelta = Delta.fromObject(bufferDelta)
@@ -44,5 +46,11 @@ class ScreenLineFragment
bufferDelta = @bufferDelta.add(other.bufferDelta)
new ScreenLineFragment(tokens, text, screenDelta, bufferDelta)
lengthForClipping: ->
if @isAtomic
0
else
@text.length
isEqual: (other) ->
_.isEqual(@tokens, other.tokens) and @screenDelta.isEqual(other.screenDelta) and @bufferDelta.isEqual(other.bufferDelta)