mirror of
https://github.com/atom/atom.git
synced 2026-02-09 14:15:24 -05:00
💄
This commit is contained in:
@@ -155,7 +155,7 @@ class Buffer
|
||||
|
||||
@mode = new (require("ace/mode/#{modeName}").Mode)
|
||||
|
||||
traverseRegexMatchesInRange: (regex, range, iterator) ->
|
||||
scanRegexMatchesInRange: (regex, range, iterator) ->
|
||||
range = Range.fromObject(range)
|
||||
global = regex.global
|
||||
regex = new RegExp(regex.source, 'gm')
|
||||
@@ -205,7 +205,7 @@ class Buffer
|
||||
regex = new RegExp(regex.source, 'gm')
|
||||
|
||||
matches = []
|
||||
@traverseRegexMatchesInRange regex, range, (match, matchRange) ->
|
||||
@scanRegexMatchesInRange regex, range, (match, matchRange) ->
|
||||
matches.push([match, matchRange])
|
||||
|
||||
matches.reverse()
|
||||
|
||||
@@ -13,14 +13,14 @@ class RegexAddress extends Address
|
||||
rangeToSearch = new Range(selectedRange.end, editor.getEofPosition())
|
||||
|
||||
rangeToReturn = null
|
||||
editor.buffer.traverseRegexMatchesInRange @regex, rangeToSearch, (match, range) ->
|
||||
editor.buffer.scanRegexMatchesInRange @regex, rangeToSearch, (match, range) ->
|
||||
rangeToReturn = range
|
||||
|
||||
if rangeToReturn
|
||||
rangeToReturn
|
||||
else
|
||||
rangeToSearch = new Range([0, 0], rangeToSearch.start)
|
||||
editor.buffer.traverseRegexMatchesInRange @regex, rangeToSearch, (match, range) ->
|
||||
editor.buffer.scanRegexMatchesInRange @regex, rangeToSearch, (match, range) ->
|
||||
rangeToReturn = range
|
||||
|
||||
rangeToReturn or selectedRange
|
||||
|
||||
@@ -11,7 +11,7 @@ class SelectAllMatches extends Command
|
||||
execute: (editor) ->
|
||||
rangesToSelect = []
|
||||
for selection in editor.getSelections()
|
||||
editor.buffer.traverseRegexMatchesInRange @regex, selection.getBufferRange(), (match, range) ->
|
||||
editor.buffer.scanRegexMatchesInRange @regex, selection.getBufferRange(), (match, range) ->
|
||||
rangesToSelect.push(range)
|
||||
|
||||
editor.clearSelections()
|
||||
|
||||
@@ -11,6 +11,6 @@ class Substitution extends Command
|
||||
|
||||
execute: (editor) ->
|
||||
range = editor.getSelection().getBufferRange()
|
||||
editor.buffer.traverseRegexMatchesInRange @regex, range, (match, matchRange, { replace }) =>
|
||||
editor.buffer.scanRegexMatchesInRange @regex, range, (match, matchRange, { replace }) =>
|
||||
replace(@replacementText)
|
||||
|
||||
|
||||
@@ -77,7 +77,7 @@ class Cursor extends View
|
||||
range = [bufferPosition, @editor.getEofPosition()]
|
||||
|
||||
nextPosition = null
|
||||
@editor.traverseRegexMatchesInRange @wordRegex, range, (match, matchRange, { stop }) =>
|
||||
@editor.scanRegexMatchesInRange @wordRegex, range, (match, matchRange, { stop }) =>
|
||||
if matchRange.start.isGreaterThan(bufferPosition)
|
||||
nextPosition = matchRange.start
|
||||
stop()
|
||||
@@ -95,7 +95,7 @@ class Cursor extends View
|
||||
bufferPosition = @getBufferPosition()
|
||||
range = [bufferPosition, @editor.getEofPosition()]
|
||||
|
||||
@editor.traverseRegexMatchesInRange @wordRegex, range, (match, matchRange, { stop }) =>
|
||||
@editor.scanRegexMatchesInRange @wordRegex, range, (match, matchRange, { stop }) =>
|
||||
@setBufferPosition matchRange.end
|
||||
stop()
|
||||
|
||||
@@ -111,7 +111,7 @@ class Cursor extends View
|
||||
position = @getBufferPosition()
|
||||
range = @editor.rangeForBufferRow(position.row)
|
||||
newPosition = null
|
||||
@editor.traverseRegexMatchesInRange /^\s*/, range, (match, matchRange) =>
|
||||
@editor.scanRegexMatchesInRange /^\s*/, range, (match, matchRange) =>
|
||||
newPosition = matchRange.end
|
||||
newPosition = [position.row, 0] if newPosition.isEqual(position)
|
||||
@setBufferPosition(newPosition)
|
||||
|
||||
@@ -394,7 +394,7 @@ class Editor extends View
|
||||
lineForBufferRow: (row) -> @buffer.lineForRow(row)
|
||||
lineLengthForBufferRow: (row) -> @buffer.lineLengthForRow(row)
|
||||
rangeForBufferRow: (row) -> @buffer.rangeForRow(row)
|
||||
traverseRegexMatchesInRange: (args...) -> @buffer.traverseRegexMatchesInRange(args...)
|
||||
scanRegexMatchesInRange: (args...) -> @buffer.scanRegexMatchesInRange(args...)
|
||||
backwardsTraverseRegexMatchesInRange: (args...) -> @buffer.backwardsTraverseRegexMatchesInRange(args...)
|
||||
|
||||
insertText: (text) ->
|
||||
|
||||
Reference in New Issue
Block a user