Added support to revert changes in ranges

Author: edgardmessias

icons/dark/clean.svg

@@ -145,7 +145,7 @@
       },
       {
         "command": "svn.revert",
-        "title": "Revert Selected",
+        "title": "Revert Selected File",
         "category": "SVN"
       },
       {
@@ -172,6 +172,20 @@
         "command": "svn.log",
         "title": "Show commit messages",
         "category": "SVN"
+      },
+      {
+        "command": "svn.revertChange",
+        "title": "Revert Change",
+        "category": "SVN",
+        "icon": {
+          "light": "icons/light/clean.svg",
+          "dark": "icons/dark/clean.svg"
+        }
+      },
+      {
+        "command": "svn.revertSelectedRanges",
+        "title": "Revert Selected Ranges",
+        "category": "SVN"
       }
     ],
     "menus": {
@@ -207,6 +221,14 @@
         {
           "command": "svn.commitWithMessage",
           "when": "false"
+        },
+        {
+          "command": "svn.revertChange",
+          "when": "false"
+        },
+        {
+          "command": "svn.revertSelectedRanges",
+          "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
         }
       ],
       "scm/title": [
@@ -322,6 +344,12 @@
           "group": "2_modification"
         }
       ],
+      "scm/change/title": [
+        {
+          "command": "svn.revertChange",
+          "when": "config.svn.enabled && originalResourceScheme == svn"
+        }
+      ],
       "editor/title": [
         {
           "command": "svn.openFile",
@@ -340,6 +368,12 @@
           "group": "navigation",
           "when":
             "config.svn.enabled && svnOpenRepositoryCount != 0 && !isInDiffEditor && resourceScheme == file"
+        },
+        {
+          "command": "svn.revertSelectedRanges",
+          "group": "2_svn@3",
+          "when":
+            "config.svn.enabled && svnOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme != merge-conflict.conflict-diff"
         }
       ]
     },

icons/light/clean.svg

@@ -9,7 +9,12 @@ import {
   SourceControlResourceGroup,
   ViewColumn,
   SourceControlResourceState,
-  ProgressLocation
+  ProgressLocation,
+  LineChange,
+  WorkspaceEdit,
+  Range,
+  Position,
+  TextEditor
 } from "vscode";
 import { inputCommitMessage } from "./messages";
 import { Svn, Status, SvnErrorCodes } from "./svn";
@@ -21,9 +26,11 @@ import * as fs from "fs";
 import * as path from "path";
 import { start } from "repl";
 import { getConflictPickOptions } from "./conflictItems";
+import { applyLineChanges } from "./lineChanges";
 
 interface CommandOptions {
   repository?: boolean;
+  diff?: boolean;
 }
 
 interface Command {
@@ -135,7 +142,11 @@ export class SvnCommands {
   constructor(private model: Model) {
     Commands.map(({ commandId, method, options }) => {
       const command = this.createCommand(method, options);
-      commands.registerCommand(commandId, command);
+      if (options.diff) {
+        return commands.registerDiffInformationCommand(commandId, command);
+      } else {
+        return commands.registerCommand(commandId, command);
+      }
     });
   }
 
@@ -889,6 +900,108 @@ export class SvnCommands {
     }
   }
 
+  private async _revertChanges(
+    textEditor: TextEditor,
+    changes: LineChange[]
+  ): Promise<void> {
+    const modifiedDocument = textEditor.document;
+    const modifiedUri = modifiedDocument.uri;
+
+    if (modifiedUri.scheme !== "file") {
+      return;
+    }
+
+    const originalUri = toSvnUri(modifiedUri, "BASE");
+    const originalDocument = await workspace.openTextDocument(originalUri);
+    const basename = path.basename(modifiedUri.fsPath);
+    const message = `Are you sure you want to revert the selected changes in ${basename}?`;
+    const yes = "Revert Changes";
+    const pick = await window.showWarningMessage(message, { modal: true }, yes);
+
+    if (pick !== yes) {
+      return;
+    }
+
+    const result = applyLineChanges(
+      originalDocument,
+      modifiedDocument,
+      changes
+    );
+    const edit = new WorkspaceEdit();
+    edit.replace(
+      modifiedUri,
+      new Range(
+        new Position(0, 0),
+        modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end
+      ),
+      result
+    );
+    workspace.applyEdit(edit);
+    await modifiedDocument.save();
+  }
+
+  @command("svn.revertChange")
+  async revertChange(
+    uri: Uri,
+    changes: LineChange[],
+    index: number
+  ): Promise<void> {
+    const textEditor = window.visibleTextEditors.filter(
+      e => e.document.uri.toString() === uri.toString()
+    )[0];
+
+    if (!textEditor) {
+      return;
+    }
+
+    await this._revertChanges(textEditor, [
+      ...changes.slice(0, index),
+      ...changes.slice(index + 1)
+    ]);
+  }
+
+  @command("svn.revertSelectedRanges", { diff: true })
+  async revertSelectedRanges(changes: LineChange[]): Promise<void> {
+    const textEditor = window.activeTextEditor;
+
+    if (!textEditor) {
+      return;
+    }
+
+    const modifiedDocument = textEditor.document;
+    const selections = textEditor.selections;
+    const selectedChanges = changes.filter(change => {
+      const modifiedRange =
+        change.modifiedEndLineNumber === 0
+          ? new Range(
+              modifiedDocument.lineAt(
+                change.modifiedStartLineNumber - 1
+              ).range.end,
+              modifiedDocument.lineAt(
+                change.modifiedStartLineNumber
+              ).range.start
+            )
+          : new Range(
+              modifiedDocument.lineAt(
+                change.modifiedStartLineNumber - 1
+              ).range.start,
+              modifiedDocument.lineAt(
+                change.modifiedEndLineNumber - 1
+              ).range.end
+            );
+
+      return selections.every(
+        selection => !selection.intersection(modifiedRange)
+      );
+    });
+
+    if (selectedChanges.length === changes.length) {
+      return;
+    }
+
+    await this._revertChanges(textEditor, selectedChanges);
+  }
+
   private getSCMResource(uri?: Uri): Resource | undefined {
     uri = uri
       ? uri

package.json

@@ -0,0 +1,54 @@
+import { TextDocument, LineChange, Range } from "vscode";
+
+export function applyLineChanges(
+  original: TextDocument,
+  modified: TextDocument,
+  diffs: LineChange[]
+): string {
+  const result: string[] = [];
+  let currentLine = 0;
+
+  for (let diff of diffs) {
+    const isInsertion = diff.originalEndLineNumber === 0;
+    const isDeletion = diff.modifiedEndLineNumber === 0;
+
+    result.push(
+      original.getText(
+        new Range(
+          currentLine,
+          0,
+          isInsertion
+            ? diff.originalStartLineNumber
+            : diff.originalStartLineNumber - 1,
+          0
+        )
+      )
+    );
+
+    if (!isDeletion) {
+      let fromLine = diff.modifiedStartLineNumber - 1;
+      let fromCharacter = 0;
+
+      if (isInsertion && diff.originalStartLineNumber === original.lineCount) {
+        fromLine = original.lineCount - 1;
+        fromCharacter = original.lineAt(fromLine).range.end.character;
+      }
+
+      result.push(
+        modified.getText(
+          new Range(fromLine, fromCharacter, diff.modifiedEndLineNumber, 0)
+        )
+      );
+    }
+
+    currentLine = isInsertion
+      ? diff.originalStartLineNumber
+      : diff.originalEndLineNumber;
+  }
+
+  result.push(
+    original.getText(new Range(currentLine, 0, original.lineCount, 0))
+  );
+
+  return result.join("");
+}