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

Replace stayValid option w/ validationStrategy when creating markers

Browse Source
This commit is contained in:
Kevin Sawicki & Nathan Sobo
2013-02-26 17:03:02 -07:00
parent d6d6ff8cca
commit e858f7eb2a
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/buffer-marker.coffee
View File

@@ -8,9 +8,9 @@ class BufferMarker
headPosition: null
tailPosition: null
suppressObserverNotification: false
stayValid: false
invalidationStrategy: 'contains'
constructor: ({@id, @buffer, range, @stayValid, noTail, reverse}) ->
constructor: ({@id, @buffer, range, @invalidationStrategy, noTail, reverse}) ->
@setRange(range, {noTail, reverse})
setRange: (range, options={}) ->
@@ -76,7 +76,7 @@ class BufferMarker
containsEnd = oldRange.containsPoint(@getEndPosition(), exclusive: true)
return unless containsEnd or containsStart
if @stayValid
if @invalidationStrategy is 'never'
previousRange = @getRange()
if containsStart and containsEnd
@setRange([oldRange.end, oldRange.end])

6
src/app/edit-session.coffee
View File

@@ -538,11 +538,11 @@ class EditSession
_.last(@cursors)
addCursorAtScreenPosition: (screenPosition) ->
marker = @markScreenPosition(screenPosition, stayValid: true)
marker = @markScreenPosition(screenPosition, invalidationStrategy: 'never')
@addSelection(marker).cursor
addCursorAtBufferPosition: (bufferPosition) ->
marker = @markBufferPosition(bufferPosition, stayValid: true)
marker = @markBufferPosition(bufferPosition, invalidationStrategy: 'never')
@addSelection(marker).cursor
addCursor: (marker) ->
@@ -565,7 +565,7 @@ class EditSession
selection
addSelectionForBufferRange: (bufferRange, options={}) ->
options = _.defaults({stayValid: true}, options)
options = _.defaults({invalidationStrategy: 'never'}, options)
marker = @markBufferRange(bufferRange, options)
@addSelection(marker)