From 7e679158b3ce881f480867e862d3edc0e58a4153 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sat, 27 Dec 2025 12:57:18 +1100 Subject: [PATCH 1/2] Make Deletes respect Build and AI detection --- src/DiffEngine.Tests/DiffEngineTrayTest.cs | 5 +++-- src/DiffEngine/DiffRunner.cs | 23 +++++++++++++++++++++- src/DiffEngine/Tray/DiffEngineTray.cs | 3 ++- src/Directory.Build.props | 2 +- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/DiffEngine.Tests/DiffEngineTrayTest.cs b/src/DiffEngine.Tests/DiffEngineTrayTest.cs index 47e9ac61..ca895ae7 100644 --- a/src/DiffEngine.Tests/DiffEngineTrayTest.cs +++ b/src/DiffEngine.Tests/DiffEngineTrayTest.cs @@ -1,7 +1,8 @@ -public class DiffEngineTrayTest(ITestOutputHelper output) : +#pragma warning disable CS0618 // Type or member is obsolete +public class DiffEngineTrayTest(ITestOutputHelper output) : XunitContextBase(output) { [Fact] public void IsRunning() => Assert.False(DiffEngineTray.IsRunning); -} \ No newline at end of file +} diff --git a/src/DiffEngine/DiffRunner.cs b/src/DiffEngine/DiffRunner.cs index 286b03f4..c8ec3705 100644 --- a/src/DiffEngine/DiffRunner.cs +++ b/src/DiffEngine/DiffRunner.cs @@ -1,4 +1,5 @@ -namespace DiffEngine; +#pragma warning disable CS0618 // Type or member is obsolete +namespace DiffEngine; /// /// Manages diff tools processes. @@ -109,6 +110,26 @@ public static LaunchResult Launch(ResolvedTool tool, string tempFile, string tar encoding); } + public static void AddDelete(string file) + { + if (Disabled) + { + return; + } + + DiffEngineTray.AddDelete(file); + } + + public static Task AddDeleteAsync(string file) + { + if (Disabled) + { + return Task.CompletedTask; + } + + return DiffEngineTray.AddDeleteAsync(file); + } + public static Task LaunchAsync(ResolvedTool tool, string tempFile, string targetFile, Encoding? encoding = null) { GuardFiles(tempFile, targetFile); diff --git a/src/DiffEngine/Tray/DiffEngineTray.cs b/src/DiffEngine/Tray/DiffEngineTray.cs index ac8e2c92..a0245a0b 100644 --- a/src/DiffEngine/Tray/DiffEngineTray.cs +++ b/src/DiffEngine/Tray/DiffEngineTray.cs @@ -1,5 +1,6 @@ namespace DiffEngine; +[Obsolete("Use DiffRunner")] public static class DiffEngineTray { static DiffEngineTray() @@ -72,4 +73,4 @@ public static Task AddMoveAsync( return PiperClient.SendMoveAsync(tempFile, targetFile, exe, arguments, canKill, processId, cancel); } -} \ No newline at end of file +} diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 5326ad4e..4224eb38 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ CS1591;CS0649;NU1608;NU1109 - 18.1.2 + 18.2.0 1.0.0 Testing, Snapshot, Diff, Compare Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries. From 27ed67bec9e587d13b5af481fe96d4f0b8bf3a40 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sat, 27 Dec 2025 12:58:05 +1100 Subject: [PATCH 2/2] Update DiffRunner.cs --- src/DiffEngine/DiffRunner.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/DiffEngine/DiffRunner.cs b/src/DiffEngine/DiffRunner.cs index c8ec3705..888c8bca 100644 --- a/src/DiffEngine/DiffRunner.cs +++ b/src/DiffEngine/DiffRunner.cs @@ -65,6 +65,7 @@ public static Task LaunchAsync(string tempFile, string targetFile, targetFile, encoding); } + /// /// Launch a diff tool for the given paths. ///