Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Expand selection on repeated calls to bracket-matcher:select-inside-brackets. #167

Closed
wants to merge 3 commits into from
Closed

Expand selection on repeated calls to bracket-matcher:select-inside-brackets. #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cb9214
:bug: Expand the selection on repeated uses of ctrl-cmd-m.
bwinton Jul 30, 2015
b6234f3
Get the XML case working, too.
bwinton Jul 30, 2015
7f72de7
Fix lint error. :smile:
bwinton Jul 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/bracket-matcher-view.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,17 +257,23 @@ class BracketMatcherView
endPosition = endRange.start
else
if startPosition = @findAnyStartPair(@editor.getCursorBufferPosition())
startPositionExternal = startPosition
startPair = @editor.getTextInRange(Range.fromPointWithDelta(startPosition, 0, 1))
endPosition = @findMatchingEndPair(startPosition, startPair, startPairMatches[startPair])
else if pair = @tagFinder.findEnclosingTags()
endPositionExternal = endPosition.traverse([0, 1])
else if pair = @tagFinder.findEnclosingTags(@editor.getSelectedBufferRange().start)
{startRange, endRange} = pair
if startRange.compare(endRange) > 0
[startRange, endRange] = [endRange, startRange]
startPosition = startRange.end
endPosition = endRange.start.traverse([0, -2]) # Don't select </
startPositionExternal = startRange.start.traverse([0, -1])
endPositionExternal = endRange.end.traverse([0, 1])

if startPosition? and endPosition?
rangeToSelect = new Range(startPosition.traverse([0, 1]), endPosition)
if @editor.getSelectedBufferRange().containsRange(rangeToSelect)
rangeToSelect = new Range(startPositionExternal, endPositionExternal)
@editor.setSelectedBufferRange(rangeToSelect)

# Insert at the current cursor position a closing tag if there exists an
Expand Down
8 changes: 4 additions & 4 deletions lib/tag-finder.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ class TagFinder

endRange

findStartEndTags: ->
findStartEndTags: (endPosition) ->
ranges = null
endPosition = @editor.getLastCursor().getCurrentWordBufferRange({@wordRegex}).end
endPosition = endPosition or @editor.getLastCursor().getCurrentWordBufferRange({@wordRegex}).end
@editor.backwardsScanInBufferRange @tagPattern, [[0, 0], endPosition], ({match, range, stop}) =>
stop()

Expand All @@ -85,8 +85,8 @@ class TagFinder
ranges = {startRange, endRange} if startRange? and endRange?
ranges

findEnclosingTags: ->
if ranges = @findStartEndTags()
findEnclosingTags: (endPosition) ->
if ranges = @findStartEndTags(endPosition)
if @isTagRange(ranges.startRange) and @isTagRange(ranges.endRange)
return ranges

Expand Down