github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 23:08:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Try new way

Browse Source
This commit is contained in:
Benjamin Gray
2018-11-22 00:56:00 +11:00
parent 6ae7ecbd0a
commit cc845c3bae
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/text-editor.js
View File

@@ -2692,7 +2692,7 @@ class TextEditor {
//
// Returns a {Cursor}.
addCursorAtBufferPosition (bufferPosition, options) {
this.selectionsMarkerLayer.markBufferPosition(bufferPosition, {invalidate: 'never'})
this.selectionsMarkerLayer.markBufferPosition(bufferPosition, {invalidate: 'never', exclusive: true})
if (!options || options.autoscroll !== false) this.getLastSelection().cursor.autoscroll()
return this.getLastSelection().cursor
}
@@ -2703,7 +2703,7 @@ class TextEditor {
//
// Returns a {Cursor}.
addCursorAtScreenPosition (screenPosition, options) {
this.selectionsMarkerLayer.markScreenPosition(screenPosition, {invalidate: 'never'})
this.selectionsMarkerLayer.markScreenPosition(screenPosition, {invalidate: 'never', exclusive: true})
if (!options || options.autoscroll !== false) this.getLastSelection().cursor.autoscroll()
return this.getLastSelection().cursor
}
@@ -4796,23 +4796,20 @@ class TextEditor {
this.buffer.insert([end, this.buffer.lineLengthForRow(end)], ' ' + commentEndString)
// Prevent the cursor from selecting / passing the delimiters
// See https://github.com/atom/atom/pull/17519
if (options.correctSelection && options.selection) {
let endLineLength = this.buffer.lineLengthForRow(end)
let startDelta, endDelta
let oldRange = options.selection.getBufferRange()
if (oldRange.isEmpty()) {
if (oldRange.start.column === indentLength) {
startDelta = [0, commentStartString.length + 1]
} else if (oldRange.start.column === endLineLength) {
startDelta = [0, -commentEndString.length - 1]
} else {
startDelta = [0, 0]
if (oldRange.start.column === endLineLength) {
let endCol = endLineLength - commentEndString.length - 1
options.selection.setBufferRange([[end, endCol], [end, endCol]], {autoscroll: false})
return
}
options.selection.setBufferRange(oldRange.translate(startDelta), { autoscroll: false })
} else {
startDelta = oldRange.start.column === indentLength ? [0, commentStartString.length + 1] : [0, 0]
endDelta = oldRange.end.column === endLineLength ? [0, -commentEndString.length - 1] : [0, 0]
options.selection.setBufferRange(oldRange.translate(startDelta, endDelta), { autoscroll: false })
let startDelta = oldRange.start.column === indentLength ? [0, commentStartString.length + 1] : [0, 0]
let endDelta = oldRange.end.column === endLineLength ? [0, -commentEndString.length - 1] : [0, 0]
options.selection.setBufferRange(oldRange.translate(startDelta, endDelta), {autoscroll: false})
}
}
})