.

Author: SimonCropp

src/DiffEngine.Tests/DiffRunnerTests.cs

@@ -187,6 +187,7 @@ static DiffRunnerTests() =>
             autoRefresh: true,
             isMdi: false,
             supportsText: true,
+            createNoWindow: false,
             requiresTarget: true,
             launchArguments: new(
                 Left: (tempFile, targetFile) => $"\"{tempFile}\" \"{targetFile}\"",

src/DiffEngine.Tests/DiffToolsTest.cs

@@ -20,6 +20,7 @@ public void AddTool()
             isMdi: false,
             supportsText: true,
             requiresTarget: true,
+            createNoWindow: false,
             launchArguments: new(
                 Left: (tempFile, targetFile) => $"\"{targetFile}\" \"{tempFile}\"",
                 Right: (tempFile, targetFile) => $"\"{tempFile}\" \"{targetFile}\""),
@@ -44,6 +45,7 @@ public void OrderShouldNotMessWithAddTool()
             isMdi: false,
             supportsText: true,
             requiresTarget: true,
+            createNoWindow: false,
             launchArguments: new(
                 Left: (tempFile, targetFile) => $"\"{targetFile}\" \"{tempFile}\"",
                 Right: (tempFile, targetFile) => $"\"{tempFile}\" \"{targetFile}\""),
@@ -65,6 +67,7 @@ public void TextConvention()
             isMdi: false,
             supportsText: true,
             requiresTarget: true,
+            createNoWindow: false,
             launchArguments: new(
                 Left: (tempFile, targetFile) => $"\"{targetFile}\" \"{tempFile}\"",
                 Right: (tempFile, targetFile) => $"\"{tempFile}\" \"{targetFile}\""),

src/DiffEngine/Definition.cs

@@ -10,4 +10,5 @@ public record Definition(
     string[] BinaryExtensions,
     string Cost,
     OsSupport OsSupport,
+    bool CreateNoWindow,
     string? Notes = null);

src/DiffEngine/DiffTools_Add.cs

@@ -2,7 +2,7 @@
 
 public static partial class DiffTools
 {
-    public static ResolvedTool? AddToolBasedOn(DiffTool basedOn, string name, bool? autoRefresh = null, bool? isMdi = null, bool? supportsText = null, bool? requiresTarget = null, LaunchArguments? launchArguments = null, string? exePath = null, IEnumerable<string>? binaryExtensions = null)
+    public static ResolvedTool? AddToolBasedOn(DiffTool basedOn, string name, bool? autoRefresh = null, bool? isMdi = null, bool? supportsText = null, bool? requiresTarget = null, LaunchArguments? launchArguments = null, string? exePath = null, IEnumerable<string>? binaryExtensions = null, bool? createNoWindow = false)
     {
         var existing = resolved.SingleOrDefault(_ => _.Tool == basedOn);
         if (existing == null)
@@ -18,26 +18,27 @@ public static partial class DiffTools
             requiresTarget ?? existing.RequiresTarget,
             launchArguments ?? existing.LaunchArguments,
             exePath ?? existing.ExePath,
-            binaryExtensions ?? existing.BinaryExtensions);
+            binaryExtensions ?? existing.BinaryExtensions,
+            createNoWindow ?? existing.CreateNoWindow);
     }
 
-    public static ResolvedTool? AddTool(string name, bool autoRefresh, bool isMdi, bool supportsText, bool requiresTarget, IEnumerable<string> binaryExtensions, OsSupport osSupport) =>
-        AddTool(name, null, autoRefresh, isMdi, supportsText, requiresTarget, binaryExtensions, osSupport);
+    public static ResolvedTool? AddTool(string name, bool autoRefresh, bool isMdi, bool supportsText, bool requiresTarget, IEnumerable<string> binaryExtensions, OsSupport osSupport, bool createNoWindow) =>
+        AddTool(name, null, autoRefresh, isMdi, supportsText, requiresTarget, binaryExtensions, osSupport, createNoWindow);
 
-    public static ResolvedTool? AddTool(string name, bool autoRefresh, bool isMdi, bool supportsText, bool requiresTarget, LaunchArguments launchArguments, string exePath, IEnumerable<string> binaryExtensions) =>
-        AddInner(name, null, autoRefresh, isMdi, supportsText, requiresTarget, binaryExtensions, exePath, launchArguments);
+    public static ResolvedTool? AddTool(string name, bool autoRefresh, bool isMdi, bool supportsText, bool requiresTarget, LaunchArguments launchArguments, string exePath, IEnumerable<string> binaryExtensions, bool createNoWindow) =>
+        AddInner(name, null, autoRefresh, isMdi, supportsText, requiresTarget, binaryExtensions, exePath, launchArguments, createNoWindow);
 
-    static ResolvedTool? AddTool(string name, DiffTool? diffTool, bool autoRefresh, bool isMdi, bool supportsText, bool requiresTarget, IEnumerable<string> binaryExtensions, OsSupport osSupport)
+    static ResolvedTool? AddTool(string name, DiffTool? diffTool, bool autoRefresh, bool isMdi, bool supportsText, bool requiresTarget, IEnumerable<string> binaryExtensions, OsSupport osSupport, bool createNoWindow)
     {
         if (!OsSettingsResolver.Resolve(name, osSupport, out var exePath, out var launchArguments))
         {
             return null;
         }
 
-        return AddInner(name, diffTool, autoRefresh, isMdi, supportsText, requiresTarget, binaryExtensions, exePath, launchArguments);
+        return AddInner(name, diffTool, autoRefresh, isMdi, supportsText, requiresTarget, binaryExtensions, exePath, launchArguments, createNoWindow);
     }
 
-    static ResolvedTool? AddInner(string name, DiffTool? diffTool, bool autoRefresh, bool isMdi, bool supportsText, bool requiresTarget, IEnumerable<string> binaries, string exePath, LaunchArguments launchArguments)
+    static ResolvedTool? AddInner(string name, DiffTool? diffTool, bool autoRefresh, bool isMdi, bool supportsText, bool requiresTarget, IEnumerable<string> binaries, string exePath, LaunchArguments launchArguments, bool createNoWindow)
     {
         Guard.AgainstEmpty(name, nameof(name));
         if (resolved.Any(_ => _.Name == name))
@@ -59,7 +60,8 @@ public static partial class DiffTools
             autoRefresh,
             binaries.ToList(),
             requiresTarget,
-            supportsText);
+            supportsText,
+            createNoWindow);
 
         AddResolvedToolAtStart(tool);
 
@@ -95,7 +97,8 @@ static void InitTools(bool throwForNoTool, IEnumerable<DiffTool> order)
                 definition.SupportsText,
                 definition.RequiresTarget,
                 definition.BinaryExtensions,
-                definition.OsSupport);
+                definition.OsSupport,
+                definition.CreateNoWindow);
         }
 
         custom.Reverse();

src/DiffEngine/Implementation/AraxisMerge.cs

@@ -9,6 +9,7 @@ public static Definition AraxisMerge() =>
             Cost: "Paid",
             SupportsText: true,
             RequiresTarget: true,
+            CreateNoWindow: false,
             BinaryExtensions:
             [
                 ".svg",

src/DiffEngine/Implementation/BeyondCompare.cs

@@ -20,6 +20,7 @@ static string RightOsxLinuxArguments(string temp, string target) =>
             AutoRefresh: true,
             IsMdi: false,
             SupportsText: true,
+            CreateNoWindow: false,
             Cost: "Paid",
             // technically BC doesnt require a target.
             // but if no target exists, the target cannot be edited

src/DiffEngine/Implementation/Diffinity.cs

@@ -7,6 +7,7 @@ public static Definition Diffinity() =>
             AutoRefresh: true,
             IsMdi: false,
             SupportsText: true,
+            CreateNoWindow: false,
             RequiresTarget: true,
             Cost: "Free with option to donate",
             BinaryExtensions: [".svg"],

src/DiffEngine/Implementation/ExamDiff.cs

@@ -22,6 +22,7 @@ static string RightArguments(string temp, string target)
             AutoRefresh: true,
             IsMdi: false,
             SupportsText: true,
+            CreateNoWindow: false,
             RequiresTarget: true,
             Cost: "Paid",
             BinaryExtensions: [".svg"],

src/DiffEngine/Implementation/Guiffy.cs

@@ -12,6 +12,7 @@ public static Definition Guiffy()
             AutoRefresh: false,
             IsMdi: false,
             SupportsText: true,
+            CreateNoWindow: false,
             RequiresTarget: true,
             Cost: "Paid",
             BinaryExtensions:

src/DiffEngine/Implementation/KDiff3.cs

@@ -12,6 +12,7 @@ public static Definition KDiff3()
             AutoRefresh: false,
             IsMdi: false,
             SupportsText: true,
+            CreateNoWindow: false,
             RequiresTarget: true,
             Cost: "Free",
             BinaryExtensions: [".svg"],