Skip to content

Commit 378f988

Browse files
Doug Watkinssompylasar
authored andcommitted
Updated to get rid of deprecated use of undo: 'skip', attempt 2 (#5)
* Updated to get rid of deprecated use of undo: 'skip' * Use `editor.buffer.groupLastChanges()` instead of `editor.groupLastChanges()` to avoid jumping cursor issue when moving across empty lines. Fixes #3
1 parent 8c36013 commit 378f988

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

lib/atom-cursor-indent.coffee

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ ALL_WHITESPACE_REGEXP = /^\s*$/
1616
debugLog = (name) ->
1717
if (isDebug)
1818
console.log.apply(console, [ 'atom-cursor-indent:' + name ].concat( [].slice.call(arguments, 1) ))
19-
20-
19+
20+
2121
nextTick = () ->
2222
return new Promise((resolve) ->
2323
process.nextTick(resolve)
@@ -92,7 +92,8 @@ removeTrailingWhitespace = (editor, lineInfo, keepColumn = 0) ->
9292
trailingWhitespaceBufferRange = new Range(currLineEndNoWhitespaceBufferPos, lineInfo.end.bufferPos)
9393
trailingWhitespaceBufferText = editor.getTextInBufferRange(trailingWhitespaceBufferRange)
9494
if (trailingWhitespaceBufferText != '')
95-
editor.setTextInBufferRange(trailingWhitespaceBufferRange, '', { undo: 'skip' })
95+
editor.setTextInBufferRange(trailingWhitespaceBufferRange, '')
96+
editor.buffer.groupLastChanges()
9697
return true
9798
return
9899

@@ -104,7 +105,8 @@ removeIndentWhitespace = (editor, lineInfo) ->
104105
lineBufferRange = new Range(lineInfo.start.bufferPos, lineInfo.end.bufferPos)
105106
lineBufferText = lineInfo.bufferText
106107
if (lineBufferText != '')
107-
editor.setTextInBufferRange(lineBufferRange, '', { undo: 'skip' })
108+
editor.setTextInBufferRange(lineBufferRange, '')
109+
editor.buffer.groupLastChanges()
108110
return true
109111
return
110112

@@ -119,7 +121,8 @@ setIndentationForBufferRowWithoutUndo = (editor, bufferRow, newLevel) ->
119121
nextIndentString: nextIndentString,
120122
})
121123
prevIndentBufferRange = [[bufferRow, 0], [bufferRow, prevIndentString.length]]
122-
editor.setTextInBufferRange(prevIndentBufferRange, nextIndentString, { undo: 'skip' })
124+
editor.setTextInBufferRange(prevIndentBufferRange, nextIndentString)
125+
editor.buffer.groupLastChanges()
123126
return true
124127
return
125128

0 commit comments

Comments
 (0)