cleanup

Author: SimonCropp

src/DiffEngine/Inline/InlineApplier.cs

@@ -230,7 +230,9 @@ static string ResolveLink(string path)
             return path;
         }
 #else
+#pragma warning disable IDE0022
         return path;
+#pragma warning restore IDE0022
 #endif
     }
 

src/DiffEngineTray.Tests/DiffRunnerViewerMoveTest.cs

@@ -1,7 +1,5 @@
 extern alias viewer;
 
-using System.Runtime.InteropServices;
-
 using ViewerCommandLine = viewer::CommandLine;
 using ViewerMode = viewer::ViewerMode;
 

src/DiffEngineTray.Tests/OwnedInlineHostTest.cs

@@ -90,11 +90,9 @@ public async Task DisposalPersistsThePendingSnapshots()
     [Test]
     public async Task DisposalSkipsPatchesWhoseSourceIsGone()
     {
-        using (var owner = new Owner())
-        {
-            owner.Queue();
-            await Assert.That(owner.Host.Queued().Count).IsEqualTo(1);
-        }
+        using var owner = new Owner();
+        owner.Queue();
+        await Assert.That(owner.Host.Queued().Count).IsEqualTo(1);
 
         // Nothing to assert on disk: the fake path has no project to stage under. The absence of
         // an exception out of Dispose is the point.

src/DiffEngineTray/FilePurger.cs

@@ -65,9 +65,10 @@ static void Inner()
     };
 
     internal static string[] Find(string path) =>
-        Directory.GetFiles(path, "*.verified.*", enumeration)
-            .Concat(Directory.GetFiles(path, "*.received.*", enumeration))
-            .ToArray();
+    [
+        .. Directory.GetFiles(path, "*.verified.*", enumeration),
+        .. Directory.GetFiles(path, "*.received.*", enumeration)
+    ];
 
     static bool Confirm(string[] files)
     {
@@ -152,4 +153,4 @@ static DialogResult AskQuestion(string text, string caption, MessageBoxButtons b
             MessageBoxIcon.Question,
             MessageBoxDefaultButton.Button1,
             MessageBoxOptions.DefaultDesktopOnly);
-}
+}

src/DiffEngineTray/Tracker.cs

@@ -422,7 +422,7 @@ public void Accept(TrackedDelete delete)
         if (!ok &&
             message != null)
         {
-            Log.Error(message);
+            Log.Error("{Message}", message);
         }
     }
 
@@ -691,7 +691,7 @@ public void Clear()
         }
         else
         {
-            Log.Error(message ?? "Could not discard the pending snapshots.");
+            Log.Error("{Message}", message ?? "Could not discard the pending snapshots.");
         }
     }
 

src/DiffEngineViewer.Tests/EngineDiffTests.cs

@@ -1,6 +1,5 @@
 extern alias engine;
 
-using EngineArguments = engine::DiffEngine.LaunchArguments;
 using EngineLaunchResult = engine::DiffEngine.LaunchResult;
 using EngineRunner = engine::DiffEngine.DiffRunner;
 using EngineTool = engine::DiffEngine.DiffTool;

src/DiffEngineViewer.Tests/EngineInlineTests.cs

@@ -3,7 +3,6 @@
 using EnginePatch = engine::DiffEngine.InlinePatch;
 using EngineResult = engine::DiffEngine.InlineResult;
 using EngineRunner = engine::DiffEngine.DiffRunner;
-using EngineViewerClient = engine::DiffEngine.ViewerClient;
 
 /// <summary>
 /// DiffEngine's public inline entry point, driven against a real <see cref="ViewerServer"/> and

src/DiffEngineViewer.Tests/EngineScope.cs

@@ -1,3 +1,4 @@
+#pragma warning disable CS0618 // Type or member is obsolete
 extern alias engine;
 
 using EngineRunner = engine::DiffEngine.DiffRunner;

src/DiffEngineViewer/Native/Deview.cs

@@ -1,3 +1,4 @@
+// ReSharper disable RedundantUnsafeContext
 /// <summary>
 /// The whole native surface. Twelve or so entry points rather than a binding for all of Dear
 /// ImGui, because the shim is a renderer for <see cref="Screen"/> and nothing more.

src/DiffEngineViewer/Native/DeviewStructs.cs

@@ -1,3 +1,4 @@
+// ReSharper disable RedundantUnsafeContext
 /// <summary>
 /// Mirrors of the structs in native/include/deview.h. Every string is a byte offset and length
 /// into one UTF-8 blob, so a frame costs one buffer rather than per string marshalling.