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

Merge pull request #4188 from atom/mb-small-cleanup

Browse Source 
Clean up TextEditor::pasteText
This commit is contained in:
Max Brunsfeld
2014-11-14 10:00:22 -08:00
parent c46088e89a fa96adc2ce
commit 562ee58506
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/text-editor.coffee
View File

@@ -2496,17 +2496,15 @@ class TextEditor extends Model
pasteText: (options={}) ->
{text, metadata} = atom.clipboard.readWithMetadata()
containsNewlines = text.indexOf('\n') isnt -1
if metadata?.selections? and metadata.selections.length is @getSelections().length
if metadata?.selections?.length is @getSelections().length
@mutateSelectedText (selection, index) ->
text = metadata.selections[index]
selection.insertText(text, options)
return
else if atom.config.get(@getLastCursor().getScopeDescriptor(), "editor.normalizeIndentOnPaste") and metadata?.indentBasis?
if !@getLastCursor().hasPrecedingCharactersOnLine() or containsNewlines
if metadata?.indentBasis? and atom.config.get(@getLastCursor().getScopeDescriptor(), "editor.normalizeIndentOnPaste")
containsNewlines = text.indexOf('\n') isnt -1
if containsNewlines or !@getLastCursor().hasPrecedingCharactersOnLine()
options.indentBasis ?= metadata.indentBasis
@insertText(text, options)