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

Paste indent normalization works with on lines w/ mixed indentation

Browse Source 
Normalizing the indent no longer explodes when pasting on a line that has mixed tabs and spaces when the edit session is using hard tabs.
This commit is contained in:
Corey Johnson & Nathan Sobo
2012-12-06 11:53:57 -07:00
parent 9945c5ebbb
commit de5bd91055
3 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/selection.coffee
View File

@@ -238,11 +238,9 @@ class Selection
adjustIndentationForLine: (line, delta) ->
currentIndentLevel = @editSession.indentLevelForLine(line)
currentIndentString = @editSession.buildIndentString(currentIndentLevel)
desiredIndentLevel = Math.max(0, currentIndentLevel + delta)
desiredIndentString = @editSession.buildIndentString(desiredIndentLevel)
line.replace(new RegExp("^#{currentIndentString}"), desiredIndentString)
line.replace(/^[\t ]*/, desiredIndentString)
backspace: ->
if @isEmpty() and not @editSession.isFoldedAtScreenRow(@cursor.getScreenRow())