Add open conflict in 3-way editor option

Author: FractalBoy

package.json

@@ -272,6 +272,11 @@
                 "title": "Open File (HEAD)",
                 "category": "SVN"
             },
+            {
+                "command": "svn.openConflict",
+                "title": "Open Conflict Merge Resolution",
+                "category": "SVN"
+            },
             {
                 "command": "svn.patch",
                 "title": "Show diff patch for selected",
@@ -868,6 +873,11 @@
                     "when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
                     "group": "navigation"
                 },
+                {
+                    "command": "svn.openConflict",
+                    "when": "config.svn.enabled && scmProvider == svn && scmResourceGroup == conflicts && scmResourceGroup != external",
+                    "group": "navigation"
+                },
                 {
                     "command": "svn.patch",
                     "when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external && scmResourceGroup != conflicts && scmResourceGroup != remotechanges",
@@ -1286,4 +1296,4 @@
             }
         ]
     }
-}
+}

src/commands.ts

@@ -20,6 +20,7 @@ import { OpenFile } from "./commands/openFile";
 import { OpenHeadFile } from "./commands/openHeadFile";
 import { OpenResourceBase } from "./commands/openResourceBase";
 import { OpenResourceHead } from "./commands/openResourceHead";
+import { OpenConflict } from "./commands/openConflict";
 import { Patch } from "./commands/patch";
 import { PatchAll } from "./commands/patchAll";
 import { PatchChangeList } from "./commands/patchChangeList";
@@ -63,6 +64,7 @@ export function registerCommands(
   disposables.push(new OpenResourceBase());
   disposables.push(new OpenResourceHead());
   disposables.push(new OpenChangeBase());
+  disposables.push(new OpenConflict());
   disposables.push(new SwitchBranch());
   disposables.push(new Merge());
   disposables.push(new Revert());

src/commands/openConflict.ts

@@ -0,0 +1,33 @@
+import { SourceControlResourceState, Uri, commands } from "vscode";
+import { Command } from "./command";
+
+export class OpenConflict extends Command {
+  constructor() {
+    super("svn.openConflict");
+  }
+
+  public async execute(...resourceStates: SourceControlResourceState[]) {
+    const selection = await this.getResourceStates(resourceStates);
+
+    if (selection.length === 0) {
+      return;
+    }
+
+    this.runByRepository(selection[0].resourceUri, async (repo, result) => {
+      const info = await repo.repository.getInfo(result.fsPath);
+
+      if (!info.conflict || !info.conflict.curBaseFile || !info.conflict.prevWcFile || !info.conflict.prevBaseFile) {
+        return;
+      }
+
+      const input1 = Uri.file(info.conflict.curBaseFile);
+      const input2 = Uri.file(info.conflict.prevWcFile);
+      const base = Uri.file(info.conflict.prevBaseFile);
+
+      // TODO: _open.mergeEditor is not currently exposed to non-builtin VSCode extensions.
+      // Update the command when there is an externally facing API.
+      // See https://github.com/microsoft/vscode/tree/15bdea120dc16143a6ec01ad5f12bc273632a483/extensions/git/src/commands.ts#L748 for example usage.
+      await commands.executeCommand("_open.mergeEditor", { base, input1, input2, output: result });
+    });
+  }
+}

src/common/types.ts

@@ -44,6 +44,20 @@ export interface ISvnInfo {
     author: string;
     date: string;
   };
+  conflict?: {
+    operation: string;
+    type: string;
+    version: [{
+      kind: string;
+      pathInRepos: string;
+      reposUrl: string;
+      revision: string;
+      side: string;
+    }];
+    prevBaseFile?: string;
+    prevWcFile?: string;
+    curBaseFile?: string;
+  };
 }
 
 export interface ISvnPath {