github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-04 19:54:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add autoIndentNewline and autoDecreaseIndent options to insertText

Browse Source 
insertText now takes these options:
* autoIndent will auto indent all inserted text based
* autoIndentNewline will indent a line when a '\n' is inserted
* autoDecreaseIndent will decrease the indent if the line matches a 
decreaseIndent pattern (such as a `}` in javavascript)
This commit is contained in:
probablycorey
2013-05-07 14:33:54 -07:00
parent 537c507efe
commit c03d44da00
3 changed files with 71 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/edit-session.coffee
View File

@@ -366,7 +366,8 @@ class EditSession
# text - A {String} representing the text to insert.
# options - A set of options equivalent to {Selection.insertText}
insertText: (text, options={}) ->
options.autoIndent ?= @shouldAutoIndent()
options.autoIndentNewlines ?= @shouldAutoIndent()
options.autoDecreaseIndent ?= @shouldAutoIndent()
@mutateSelectedText (selection) -> selection.insertText(text, options)
# Inserts a new line at the current cursor positions.

17
src/app/selection.coffee
View File

@@ -255,7 +255,10 @@ class Selection
# text - A {String} representing the text to add
# options - A hash containing the following options:
# select: if `true`, selects the newly added text
# autoIndent: if `true`, indents the newly added text appropriately
# autoIndent: if `true`, indents all inserted text appropriately
# autoIndentNewlines: if `true`, indent newlines appropriately
# autoDecreaseIndent: if `true`, decreases indent level appropriately (for example, when a closing bracket is inserted)
insertText: (text, options={}) ->
oldBufferRange = @getBufferRange()
@editSession.destroyFoldsContainingBufferRow(oldBufferRange.end.row)
@@ -270,14 +273,10 @@ class Selection
else
@cursor.setBufferPosition(newBufferRange.end, skipAtomicTokens: true) if wasReversed
if options.autoIndent
if text == '\n'
@editSession.autoIndentBufferRow(newBufferRange.end.row)
else if /\n/.test(text)
for row in [newBufferRange.start.row..newBufferRange.end.row]
@editSession.autoIndentBufferRow(row)
else if /\S/.test(text)
@editSession.autoDecreaseIndentForRow(newBufferRange.start.row)
if options.autoIndent or (options.autoIndentNewlines and text == '\n')
@editSession.autoIndentBufferRow(row) for row in newBufferRange.getRows()
else if options.autoDecreaseIndent and /\S/.test text
@editSession.autoDecreaseIndentForRow(newBufferRange.start.row)
newBufferRange