mirror of
https://github.com/atom/atom.git
synced 2026-04-28 03:01:47 -04:00
Always pass a hash to TextBuffer.scanInRange iterators
This makes it easy to only assign variables for the information you need in the iterator. Before, we always forced you to take a match and a range as the first two arguments even if you weren't using them.
This commit is contained in:
@@ -142,7 +142,7 @@ class AutocompleteView extends SelectList
|
||||
lineRange = [[selectionRange.start.row, 0], [selectionRange.end.row, @editor.lineLengthForBufferRow(selectionRange.end.row)]]
|
||||
[prefix, suffix] = ["", ""]
|
||||
|
||||
@currentBuffer.scanInRange @wordRegex, lineRange, (match, range, {stop}) ->
|
||||
@currentBuffer.scanInRange @wordRegex, lineRange, ({match, range, stop}) ->
|
||||
stop() if range.start.isGreaterThan(selectionRange.end)
|
||||
|
||||
if range.intersectsWith(selectionRange)
|
||||
|
||||
@@ -102,7 +102,7 @@ module.exports =
|
||||
regex = new RegExp("[#{_.escapeRegExp(startPair + endPair)}]", 'g')
|
||||
endPairPosition = null
|
||||
unpairedCount = 0
|
||||
buffer.scanInRange regex, scanRange, (match, range, {stop}) =>
|
||||
buffer.scanInRange regex, scanRange, ({match, range, stop}) =>
|
||||
if match[0] is startPair
|
||||
unpairedCount++
|
||||
else if match[0] is endPair
|
||||
@@ -116,7 +116,7 @@ module.exports =
|
||||
regex = new RegExp("[#{_.escapeRegExp(startPair + endPair)}]", 'g')
|
||||
startPairPosition = null
|
||||
unpairedCount = 0
|
||||
buffer.backwardsScanInRange regex, scanRange, (match, range, {stop}) =>
|
||||
buffer.backwardsScanInRange regex, scanRange, ({match, range, stop}) =>
|
||||
if match[0] is endPair
|
||||
unpairedCount++
|
||||
else if match[0] is startPair
|
||||
|
||||
@@ -24,12 +24,12 @@ class RegexAddress extends Address
|
||||
|
||||
rangeToReturn = null
|
||||
scanMethodName = if @isReversed then "backwardsScanInRange" else "scanInRange"
|
||||
buffer[scanMethodName] @regex, rangeToSearch, (match, range) ->
|
||||
buffer[scanMethodName] @regex, rangeToSearch, ({range}) ->
|
||||
rangeToReturn = range
|
||||
|
||||
if not rangeToReturn
|
||||
rangeToSearch = if @isReversed then rangeAfter else rangeBefore
|
||||
buffer[scanMethodName] @regex, rangeToSearch, (match, range) ->
|
||||
buffer[scanMethodName] @regex, rangeToSearch, ({range}) ->
|
||||
rangeToReturn = range
|
||||
|
||||
if not rangeToReturn
|
||||
|
||||
@@ -12,12 +12,12 @@ class SelectAllMatches extends Command
|
||||
compile: (project, buffer, ranges) ->
|
||||
deferred = $.Deferred()
|
||||
operations = []
|
||||
for range in ranges
|
||||
buffer.scanInRange @regex, range, (match, matchRange) ->
|
||||
for scanRange in ranges
|
||||
buffer.scanInRange @regex, scanRange, ({range}) ->
|
||||
operations.push(new Operation(
|
||||
project: project
|
||||
buffer: buffer
|
||||
bufferRange: matchRange
|
||||
bufferRange: range
|
||||
))
|
||||
deferred.resolve(operations)
|
||||
deferred.promise()
|
||||
|
||||
@@ -15,12 +15,12 @@ class Substitution extends Command
|
||||
compile: (project, buffer, ranges) ->
|
||||
deferred = $.Deferred()
|
||||
operations = []
|
||||
for range in ranges
|
||||
buffer.scanInRange @regex, range, (match, matchRange) =>
|
||||
for scanRange in ranges
|
||||
buffer.scanInRange @regex, scanRange, ({range}) =>
|
||||
operations.push(new Operation(
|
||||
project: project
|
||||
buffer: buffer
|
||||
bufferRange: matchRange
|
||||
bufferRange: range
|
||||
newText: @replacementText
|
||||
preserveSelection: true
|
||||
))
|
||||
|
||||
@@ -8,7 +8,7 @@ module.exports =
|
||||
whitespaceBeforeSave: (buffer) ->
|
||||
buffer.on 'will-be-saved', ->
|
||||
buffer.transact ->
|
||||
buffer.scan /[ \t]+$/g, (match, range, { replace }) -> replace('')
|
||||
buffer.scan /[ \t]+$/g, ({replace}) -> replace('')
|
||||
|
||||
if config.get('whitespace.ensureSingleTrailingNewline')
|
||||
if buffer.getLastLine() is ''
|
||||
|
||||
Reference in New Issue
Block a user