github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-06 03:02:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Base first line delta on the cursor column, not the existing line's indent

Browse Source
This commit is contained in:
Nathan Sobo
2012-10-23 16:30:38 -06:00
parent 839d57d819
commit d1999b91ff
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/selection.coffee
View File

@@ -159,10 +159,12 @@ class Selection
textPrecedingCursor = @editSession.buffer.getTextInRange([[currentBufferRow, 0], [currentBufferRow, currentBufferColumn]])
insideExistingLine = textPrecedingCursor.match(/\S/)
if insideExistingLine or not @editSession.autoIndent
if insideExistingLine
desiredBase = @editSession.indentationForBufferRow(currentBufferRow)
else
else if @editSession.autoIndent
desiredBase = @editSession.suggestedIndentForBufferRow(currentBufferRow)
else
desiredBase = currentBufferColumn
currentBase = lines[0].match(/\s*/)[0].length
delta = desiredBase - currentBase
@@ -172,7 +174,8 @@ class Selection
if insideExistingLine
firstLineDelta = -line.length # remove all leading whitespace
else
firstLineDelta = delta - @editSession.indentationForBufferRow(currentBufferRow)
firstLineDelta = delta - currentBufferColumn
normalizedLines.push(@adjustIndentationForLine(line, firstLineDelta))
else
normalizedLines.push(@adjustIndentationForLine(line, delta))