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

Avoid spurious updates in autoDecreaseIndentForBufferRow

Browse Source
This commit is contained in:
Max Brunsfeld
2017-09-23 00:22:11 -07:00
parent 9abcad11e4
commit a73de8c0b5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/text-editor.coffee
View File

@@ -3083,8 +3083,7 @@ class TextEditor extends Model
else
endColumn = @lineTextForBufferRow(bufferRow).match(/^\s*/)[0].length
newIndentString = @buildIndentString(newLevel)
if newIndentString.length isnt endColumn
@buffer.setTextInRange([[bufferRow, 0], [bufferRow, endColumn]], newIndentString)
@buffer.setTextInRange([[bufferRow, 0], [bufferRow, endColumn]], newIndentString)
# Extended: Indent rows intersecting selections by one level.
indentSelectedRows: ->
@@ -3883,7 +3882,7 @@ class TextEditor extends Model
autoDecreaseIndentForBufferRow: (bufferRow) ->
indentLevel = @tokenizedBuffer.suggestedIndentForEditedBufferRow(bufferRow)
@setIndentationForBufferRow(bufferRow, indentLevel)
@setIndentationForBufferRow(bufferRow, indentLevel) if indentLevel?
toggleLineCommentForBufferRow: (row) -> @toggleLineCommentsForBufferRows(row, row)

13
src/tokenized-buffer.js
View File

@@ -85,7 +85,8 @@ class TokenizedBuffer {
// Get the suggested indentation level for a line in the buffer on which the user is currently
// typing. This may return a different result from {::suggestedIndentForBufferRow} in order
// to avoid unexpected changes in indentation.
// to avoid unexpected changes in indentation. It may also return undefined if no change should
// be made.
//
// * bufferRow - The row {Number}
//
@@ -93,16 +94,16 @@ class TokenizedBuffer {
suggestedIndentForEditedBufferRow (bufferRow) {
const line = this.buffer.lineForRow(bufferRow)
const currentIndentLevel = this.indentLevelForLine(line)
if (currentIndentLevel === 0) return currentIndentLevel
if (currentIndentLevel === 0) return
const scopeDescriptor = this.scopeDescriptorForPosition([bufferRow, 0])
const decreaseIndentRegex = this.decreaseIndentRegexForScopeDescriptor(scopeDescriptor)
if (!decreaseIndentRegex) return currentIndentLevel
if (!decreaseIndentRegex) return
if (!decreaseIndentRegex.testSync(line)) return currentIndentLevel
if (!decreaseIndentRegex.testSync(line)) return
const precedingRow = this.buffer.previousNonBlankRow(bufferRow)
if (precedingRow == null) return currentIndentLevel
if (precedingRow == null) return
const precedingLine = this.buffer.lineForRow(precedingRow)
let desiredIndentLevel = this.indentLevelForLine(precedingLine)
@@ -118,7 +119,7 @@ class TokenizedBuffer {
}
if (desiredIndentLevel < 0) return 0
if (desiredIndentLevel > currentIndentLevel) return currentIndentLevel
if (desiredIndentLevel >= currentIndentLevel) return
return desiredIndentLevel
}