Merge pull request #501 from PowerShell/kapilmb/fix-format-on-paster

Fix formatting on paste behavior

Author: daviwil

src/features/DocumentFormatter.ts

@@ -12,7 +12,8 @@ import {
     DocumentFormattingEditProvider,
     DocumentRangeFormattingEditProvider,
     Range,
-    TextEditor
+    TextEditor,
+    TextLine
 } from 'vscode';
 import { LanguageClient, RequestType } from 'vscode-languageclient';
 import Window = vscode.window;
@@ -134,6 +135,7 @@ class PSDocumentFormattingEditProvider implements DocumentFormattingEditProvider
     private static documentLocker = new DocumentLocker();
     private static statusBarTracker = new Object();
     private languageClient: LanguageClient;
+    private lineDiff: number;
 
     // The order in which the rules will be executed starting from the first element.
     private readonly ruleOrder: string[] = [
@@ -153,6 +155,7 @@ class PSDocumentFormattingEditProvider implements DocumentFormattingEditProvider
 
     constructor(aggregateUndoStop = true) {
         this.aggregateUndoStop = aggregateUndoStop;
+        this.lineDiff = 0;
     }
 
     provideDocumentFormattingEdits(
@@ -195,6 +198,12 @@ class PSDocumentFormattingEditProvider implements DocumentFormattingEditProvider
         PSDocumentFormattingEditProvider.disposeAllStatusBars();
     }
 
+    private snapRangeToEdges(range: Range, document: TextDocument): Range {
+        return range.with({
+            start: range.start.with({ character: 0 }),
+            end: document.lineAt(range.end.line).range.end });
+    }
+
     private getEditor(document: TextDocument): TextEditor {
         return Window.visibleTextEditors.find((e, n, obj) => { return e.document === document; });
     }
@@ -248,12 +257,18 @@ class PSDocumentFormattingEditProvider implements DocumentFormattingEditProvider
                     // we need to update the range as the edits might
                     // have changed the original layout
                     if (range !== null) {
-                        let tempRange: Range = this.getSelectionRange(document);
-                        if (tempRange !== null) {
-                            range = tempRange;
+                        if (this.lineDiff !== 0) {
+                            range = range.with({ end: range.end.translate({ lineDelta: this.lineDiff }) });
                         }
+
+                        // extend the range such that it starts at the first character of the
+                        // start line of the range.
+                        range = this.snapRangeToEdges(range, document);
                     }
 
+                    // reset line difference to 0
+                    this.lineDiff = 0;
+
                     // we do not return a valid array because our text edits
                     // need to be executed in a particular order and it is
                     // easier if we perform the edits ourselves
@@ -292,7 +307,13 @@ class PSDocumentFormattingEditProvider implements DocumentFormattingEditProvider
             edit.startColumnNumber - 1,
             edit.endLineNumber - 1,
             edit.endColumnNumber - 1);
-        if (range === null || range.contains(editRange)) {
+
+        if (range === null || range.contains(editRange.start)) {
+
+            // accumulate the changes in number of lines
+            // get the difference between the number of lines in the replacement text and
+            // that of the original text
+            this.lineDiff += this.getNumLines(edit.text) - (editRange.end.line - editRange.start.line + 1);
             return editor.edit((editBuilder) => {
                 editBuilder.replace(
                     editRange,
@@ -310,13 +331,8 @@ class PSDocumentFormattingEditProvider implements DocumentFormattingEditProvider
         }
     }
 
-    private getSelectionRange(document: TextDocument): Range {
-        let editor = vscode.window.visibleTextEditors.find(editor => editor.document === document);
-        if (editor !== undefined) {
-            return editor.selection as Range;
-        }
-
-        return null;
+    private getNumLines(text: string): number {
+        return text.split(/\r?\n/).length;
     }
 
     private getSettings(rule: string): any {