Readd incremental changes (#4088)

* Readd incremental changes.

* React to OmniSharp/omnisharp-roslyn#1962

Author: 333fred

src/features/changeForwarding.ts

@@ -6,7 +6,7 @@
 import { Uri, workspace } from 'vscode';
 import { OmniSharpServer } from '../omnisharp/server';
 import * as serverUtils from '../omnisharp/utils';
-import { FileChangeType } from '../omnisharp/protocol';
+import { FileChangeType, LinePositionSpanTextChange } from '../omnisharp/protocol';
 import { IDisposable } from '../Disposable';
 import CompositeDisposable from '../CompositeDisposable';
 
@@ -23,7 +23,18 @@ function forwardDocumentChanges(server: OmniSharpServer): IDisposable {
             return;
         }
 
-        serverUtils.updateBuffer(server, { Buffer: document.getText(), FileName: document.fileName }).catch(err => {
+        const lineChanges = event.contentChanges.map(function (change): LinePositionSpanTextChange {
+            const range = change.range;
+            return {
+                NewText: change.text,
+                StartLine: range.start.line + 1,
+                StartColumn: range.start.character + 1,
+                EndLine: range.end.line + 1,
+                EndColumn: range.end.character + 1
+            };
+        });
+
+        serverUtils.updateBuffer(server, { Changes: lineChanges, FileName: document.fileName, ApplyChangesTogether: true }).catch(err => {
             console.error(err);
             return err;
         });

src/features/fixAllProvider.ts

@@ -71,7 +71,14 @@ export class FixAllProvider extends AbstractProvider implements vscode.CodeActio
     }
 
     private async applyFixes(fileName: string, scope: FixAllScope, fixAllFilter: FixAllItem[]): Promise<boolean | string | {}> {
-        let response = await serverUtils.runFixAll(this.server, { FileName: fileName, Scope: scope, FixAllFilter: fixAllFilter, WantsAllCodeActionOperations: true, WantsTextChanges: true });
+        let response = await serverUtils.runFixAll(this.server, {
+            FileName: fileName,
+            Scope: scope,
+            FixAllFilter: fixAllFilter,
+            WantsAllCodeActionOperations: true,
+            WantsTextChanges: true,
+            ApplyChanges: false
+        });
 
         if (response && Array.isArray(response.Changes)) {
             let edit = new vscode.WorkspaceEdit();
@@ -94,7 +101,7 @@ export class FixAllProvider extends AbstractProvider implements vscode.CodeActio
                 {
                     // The CodeAction requested that we open a file.
                     // Record that file name and keep processing CodeActions.
-                    // If a CodeAction requests that we open multiple files 
+                    // If a CodeAction requests that we open multiple files
                     // we only open the last one (what would it mean to open multiple files?)
                     fileToOpen = vscode.Uri.file(change.FileName);
                 }
@@ -127,7 +134,7 @@ export class FixAllProvider extends AbstractProvider implements vscode.CodeActio
             let next = applyEditPromise;
             if (renamedFiles.some(r => r.fsPath == vscode.window.activeTextEditor.document.uri.fsPath))
             {
-                next = applyEditPromise.then(_ => 
+                next = applyEditPromise.then(_ =>
                     {
                         return vscode.commands.executeCommand("workbench.action.closeActiveEditor");
                     });
@@ -141,4 +148,4 @@ export class FixAllProvider extends AbstractProvider implements vscode.CodeActio
              : next;
         }
     }
-}
+}

src/omnisharp/protocol.ts

@@ -72,6 +72,7 @@ export interface Request extends FileBasedRequest {
     Column?: number;
     Buffer?: string;
     Changes?: LinePositionSpanTextChange[];
+    ApplyChangesTogether?: boolean;
 }
 
 export interface GoToDefinitionRequest extends Request {
@@ -485,6 +486,7 @@ export interface RunFixAllRequest extends FileBasedRequest {
     FixAllFilter?: FixAllItem[];
     WantsTextChanges: boolean;
     WantsAllCodeActionOperations: boolean;
+    ApplyChanges: boolean;
 }
 
 export interface QuickInfoRequest extends Request {