From bbbf09ecf274d0665c70fb200b284fc425265dea Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Mon, 23 Oct 2017 16:18:01 -0600
Subject: [PATCH] Add preserveTrailingLineIndentation option to
 Selection.insertText

We can use this to support a new command that preserves all formatting
when pasting.
---
 spec/selection-spec.coffee |  5 +++++
 src/selection.coffee       | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/spec/selection-spec.coffee b/spec/selection-spec.coffee
index cb070310a..b0e65be30 100644
--- a/spec/selection-spec.coffee
+++ b/spec/selection-spec.coffee
@@ -103,6 +103,11 @@ describe "Selection", ->
       selection.insertText("\r\n", autoIndent: true)
       expect(buffer.lineForRow(2)).toBe "  "
 
+    it "does not adjust the indent of trailing lines if preserveTrailingLineIndentation is true", ->
+      selection.setBufferRange [[5, 0], [5, 0]]
+      selection.insertText('      foo\n    bar\n', preserveTrailingLineIndentation: true, indentBasis: 1)
+      expect(buffer.lineForRow(6)).toBe('    bar')
+
   describe ".fold()", ->
     it "folds the buffer range spanned by the selection", ->
       selection.setBufferRange([[0, 3], [1, 6]])
diff --git a/src/selection.coffee b/src/selection.coffee
index 4d3fe8882..6fcf8dd36 100644
--- a/src/selection.coffee
+++ b/src/selection.coffee
@@ -356,13 +356,19 @@ class Selection extends Model
   #
   # * `text` A {String} representing the text to add
   # * `options` (optional) {Object} with keys:
-  #   * `select` if `true`, selects the newly added text.
-  #   * `autoIndent` if `true`, indents all inserted text appropriately.
-  #   * `autoIndentNewline` if `true`, indent newline appropriately.
-  #   * `autoDecreaseIndent` if `true`, decreases indent level appropriately
+  #   * `select` If `true`, selects the newly added text.
+  #   * `autoIndent` If `true`, indents all inserted text appropriately.
+  #   * `autoIndentNewline` If `true`, indent newline appropriately.
+  #   * `autoDecreaseIndent` If `true`, decreases indent level appropriately
   #     (for example, when a closing bracket is inserted).
+  #   * `preserveTrailingLineIndentation` By default, when pasting multiple
+  #   lines, Atom attempts to preserve the relative indent level between the
+  #   first line and trailing lines, even if the indent level of the first
+  #   line has changed from the copied text. If this option is `true`, this
+  #   behavior is suppressed.
+  #     level between the first lines and the trailing lines.
   #   * `normalizeLineEndings` (optional) {Boolean} (default: true)
-  #   * `undo` if `skip`, skips the undo stack for this operation.
+  #   * `undo` If `skip`, skips the undo stack for this operation.
   insertText: (text, options={}) ->
     oldBufferRange = @getBufferRange()
     wasReversed = @isReversed()
@@ -373,7 +379,7 @@ class Selection extends Model
     remainingLines = text.split('\n')
     firstInsertedLine = remainingLines.shift()
 
-    if options.indentBasis?
+    if options.indentBasis? and not options.preserveTrailingLineIndentation
       indentAdjustment = @editor.indentLevelForLine(precedingText) - options.indentBasis
       @adjustIndent(remainingLines, indentAdjustment)