Merge branch 'main' of https://github.com/VerifyTests/DiffEngine

Author: SimonCropp

docs/diff-tool.md

@@ -780,7 +780,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
   * Is MDI: True
   * Supports auto-refresh: True
   * Supports text files: True
-  * Use shell execute: True
+  * Use shell execute: False
   * Environment variable for custom install location: `DiffEngine_VisualStudioCode`
   * Supported binaries: .svg
 
@@ -793,11 +793,11 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
   * Example target on left arguments: `--diff "targetFile.txt" "tempFile.txt" `
   * Example target on right arguments: `--diff "tempFile.txt" "targetFile.txt" `
   * Scanned paths:
-    * `%LocalAppData%\Programs\Microsoft VS Code\code.exe`
-    * `%ProgramFiles%\Microsoft VS Code\code.exe`
-    * `%ProgramW6432%\Microsoft VS Code\code.exe`
-    * `%ProgramFiles(x86)%\Microsoft VS Code\code.exe`
-    * `%PATH%code.exe`
+    * `%LocalAppData%\Programs\Microsoft VS Code\bin\code.cmd`
+    * `%ProgramFiles%\Microsoft VS Code\bin\code.cmd`
+    * `%ProgramW6432%\Microsoft VS Code\bin\code.cmd`
+    * `%ProgramFiles(x86)%\Microsoft VS Code\bin\code.cmd`
+    * `%PATH%code.cmd`
 
 #### OSX settings:
 

docs/diff-tool.order.md

@@ -51,5 +51,5 @@ For example `VisualStudio,Meld` will result in VisualStudio then Meld then all o
 ```cs
 DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge);
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L177-L181' title='Snippet source file'>snippet source</a> | <a href='#snippet-UseOrder' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L183-L187' title='Snippet source file'>snippet source</a> | <a href='#snippet-UseOrder' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->

src/DiffEngine.Tests/DiffToolsTest.cs

@@ -115,8 +115,14 @@ static async Task AddToolAndLaunch()
 
         #endregion
     }
-
     /**
+
+    [Fact]
+    public Task LaunchSpecificTextDiff() =>
+        DiffRunner.LaunchAsync(DiffTool.VisualStudioCode,
+            Path.Combine(SourceDirectory, "input.temp.txt"),
+            Path.Combine(SourceDirectory, "input.target.txt"));
+
     [Fact]
     public Task LaunchSpecificImageDiff() =>
         DiffRunner.LaunchAsync(DiffTool.P4Merge,

src/DiffEngine.Tests/diffTools.include.md

@@ -645,7 +645,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
   * Is MDI: True
   * Supports auto-refresh: True
   * Supports text files: True
-  * Use shell execute: True
+  * Use shell execute: False
   * Environment variable for custom install location: `DiffEngine_VisualStudioCode`
   * Supported binaries: .svg
 
@@ -658,11 +658,11 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
   * Example target on left arguments: `--diff "targetFile.txt" "tempFile.txt" `
   * Example target on right arguments: `--diff "tempFile.txt" "targetFile.txt" `
   * Scanned paths:
-    * `%LocalAppData%\Programs\Microsoft VS Code\code.exe`
-    * `%ProgramFiles%\Microsoft VS Code\code.exe`
-    * `%ProgramW6432%\Microsoft VS Code\code.exe`
-    * `%ProgramFiles(x86)%\Microsoft VS Code\code.exe`
-    * `%PATH%code.exe`
+    * `%LocalAppData%\Programs\Microsoft VS Code\bin\code.cmd`
+    * `%ProgramFiles%\Microsoft VS Code\bin\code.cmd`
+    * `%ProgramW6432%\Microsoft VS Code\bin\code.cmd`
+    * `%ProgramFiles(x86)%\Microsoft VS Code\bin\code.cmd`
+    * `%PATH%code.cmd`
 
 #### OSX settings:
 

src/DiffEngine/Implementation/VsCode.cs

@@ -11,16 +11,16 @@ public static Definition VisualStudioCode()
             AutoRefresh: true,
             IsMdi: true,
             SupportsText: true,
-            UseShellExecute: true,
+            UseShellExecute: false,
             RequiresTarget: true,
             Cost: "Free",
             BinaryExtensions: [".svg"],
             OsSupport: new(
                 Windows: new(
-                    "code.exe",
+                    "code.cmd",
                     launchArguments,
-                    @"%LocalAppData%\Programs\Microsoft VS Code\",
-                    @"%ProgramFiles%\Microsoft VS Code\"),
+                    @"%LocalAppData%\Programs\Microsoft VS Code\bin\",
+                    @"%ProgramFiles%\Microsoft VS Code\bin\"),
                 Linux: new(
                     "code",
                     launchArguments),