github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 22:38:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use markers instead of anchors to track which close-brackets to skip

Browse Source
This commit is contained in:
Kevin Sawicki & Nathan Sobo
2013-02-05 17:21:24 -07:00
parent 13183639b6
commit eee6903541
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/language-mode.coffee
View File

@@ -18,7 +18,7 @@ class LanguageMode
constructor: (@editSession) ->
@buffer = @editSession.buffer
@reloadGrammar()
@bracketAnchorRanges = []
@bracketMarkers = []
_.adviseBefore @editSession, 'insertText', (text) =>
return true if @editSession.hasMultipleCursors()
@@ -37,19 +37,19 @@ class LanguageMode
autoCompleteOpeningBracket = @isOpeningBracket(text) and not hasWordAfterCursor and not (@isQuote(text) and hasWordBeforeCursor)
skipOverExistingClosingBracket = false
if @isClosingBracket(text) and nextCharacter == text
if bracketAnchorRange = @bracketAnchorRanges.filter((anchorRange) -> anchorRange.getBufferRange().end.isEqual(cursorBufferPosition))[0]
if bracketMarker = _.find(@bracketMarkers, (marker) => @editSession.getMarkerBufferRange(marker).end.isEqual(cursorBufferPosition))
skipOverExistingClosingBracket = true
if skipOverExistingClosingBracket
bracketAnchorRange.destroy()
_.remove(@bracketAnchorRanges, bracketAnchorRange)
@editSession.destroyMarker(bracketMarker)
_.remove(@bracketMarkers, bracketMarker)
@editSession.moveCursorRight()
false
else if autoCompleteOpeningBracket
@editSession.insertText(text + @pairedCharacters[text])
@editSession.moveCursorLeft()
range = [cursorBufferPosition, cursorBufferPosition.add([0, text.length])]
@bracketAnchorRanges.push @editSession.addAnchorRange(range)
@bracketMarkers.push @editSession.markBufferRange(range)
false
_.adviseBefore @editSession, 'backspace', =>