cleanup

Author: SimonCropp

.editorconfig

@@ -93,6 +93,20 @@ dotnet_diagnostic.CA1822.severity = error
 # Avoid unused private fields
 dotnet_diagnostic.CA1823.severity = error
 
+# Remove unused parameter
+# non_public, because a public signature sometimes keeps a parameter it does not read: an overload
+# retained for binary compatibility cannot drop one without breaking every caller compiled against
+# it. Inside a type there is no such excuse, and a parameter nothing reads is either dead weight or
+# a bug where the argument was meant to be used.
+dotnet_diagnostic.IDE0060.severity = error
+dotnet_code_quality_unused_parameters = non_public
+
+# Remove unused private member
+dotnet_diagnostic.IDE0051.severity = error
+
+# Remove unread private member
+dotnet_diagnostic.IDE0052.severity = error
+
 # Avoid zero-length array allocations
 dotnet_diagnostic.CA1825.severity = error
 
@@ -384,7 +398,7 @@ ij_xml_space_inside_empty_tag = true
 indent_size = 2
 
 # Verify settings
-[*.{received,verified}.{txt,xml,json,md,sql,csv,html,htm,nuspec,rels}]
+[*.{received,verified}.{txt,xml,json,md,mdx,yml,sql,csv,html,htm,nuspec,rels}]
 charset = utf-8-bom
 end_of_line = lf
 indent_size = unset

src/DiffEngine.Tests/FsCompilerRoundTripTests.cs

@@ -61,7 +61,7 @@ public async Task PatchedSourceCompilesAndReadsBack()
     {
         var script = BuildScript();
         var path = Path.Combine(Path.GetTempPath(), $"DiffEngineFsRoundTrip_{Guid.NewGuid():N}.fsx");
-        File.WriteAllText(path, script, new UTF8Encoding(false));
+        await File.WriteAllTextAsync(path, script, new UTF8Encoding(false));
         try
         {
             var (exitCode, output) = RunFsi(path);

src/DiffEngine.Tests/InlineApplierTests.cs

@@ -175,7 +175,7 @@ public async Task LeavesNoTemporaryBehind()
         try
         {
             var path = Path.Combine(directory, "Sample.cs");
-            File.WriteAllBytes(path, Utf8(source, bom: false));
+            await File.WriteAllBytesAsync(path, Utf8(source, bom: false));
 
             var result = InlineApplier.Apply(Patch(path, 3, "\"old\"", "new"));
 
@@ -200,10 +200,10 @@ public async Task ContentIsNeverObservedHalfWritten()
         try
         {
             var path = Path.Combine(directory, "Big.cs");
-            File.WriteAllBytes(path, Utf8(text, bom: false));
+            await File.WriteAllBytesAsync(path, Utf8(text, bom: false));
             var before = new FileInfo(path).Length;
 
-            using var cancellation = new CancellationTokenSource();
+            using var cancellation = new CancelSource();
             var seen = new ConcurrentDictionary<long, byte>();
             var reader = Task.Run(
                 () =>
@@ -229,7 +229,7 @@ public async Task ContentIsNeverObservedHalfWritten()
             // Long enough that the two whole files differ in length, which is what makes a
             // half written one tell itself apart
             var result = InlineApplier.Apply(Patch(path, 3, "\"old\"", "a replacement longer than what it replaces"));
-            cancellation.Cancel();
+            await cancellation.CancelAsync();
             await reader;
 
             await Assert.That(result.Status).IsEqualTo(InlineApplyStatus.Applied);
@@ -265,7 +265,7 @@ public async Task ConcurrentAppliesNeverReportAMissingFile()
             var methods = Enumerable.Range(0, writers)
                 .Select(_ => $"    void M{_}() => Verify(v).Snapshot(\"a{_}\");");
             var path = Path.Combine(directory, "Contended.cs");
-            File.WriteAllBytes(path, Utf8($"class C\n{{\n{string.Join("\n", methods)}\n}}", bom: false));
+            await File.WriteAllBytesAsync(path, Utf8($"class C\n{{\n{string.Join("\n", methods)}\n}}", bom: false));
 
             var results = await Task.WhenAll(
                 Enumerable

src/DiffEngine.Tests/InlineStagingTests.cs

@@ -12,7 +12,7 @@ public async Task WritesTheTrioUnderTheProjectsObj()
         var source = project.Source("SampleTests.cs");
 
         var patch = Patch(source, "line one\nline two", framework: "net10.0");
-        var written = InlineStaging.Persist([new PendingInline(patch)]);
+        var written = InlineStaging.Persist([new(patch)]);
 
         await Assert.That(written).IsEqualTo(1);
 
@@ -32,9 +32,9 @@ await Assert.That(Path.GetFileName(patchFile))
         await Assert.That(read.OriginalValue).IsEqualTo(patch.OriginalValue);
         await Assert.That(read.Framework).IsEqualTo("net10.0");
 
-        await Assert.That(File.ReadAllText(files.Single(_ => _.EndsWith(".received.txt"))))
+        await Assert.That(await File.ReadAllTextAsync(files.Single(_ => _.EndsWith(".received.txt"))))
             .IsEqualTo("line one\nline two");
-        await Assert.That(File.ReadAllText(files.Single(_ => _.EndsWith(".expected.txt"))))
+        await Assert.That(await File.ReadAllTextAsync(files.Single(_ => _.EndsWith(".expected.txt"))))
             .IsEqualTo("old");
     }
 
@@ -44,12 +44,12 @@ public async Task PersistingAgainOverwritesRatherThanAccumulates()
         using var project = new TempProject();
         var source = project.Source("SampleTests.cs");
 
-        InlineStaging.Persist([new PendingInline(Patch(source, "first", framework: "net10.0"))]);
-        InlineStaging.Persist([new PendingInline(Patch(source, "second", framework: "net10.0"))]);
+        InlineStaging.Persist([new(Patch(source, "first", framework: "net10.0"))]);
+        InlineStaging.Persist([new(Patch(source, "second", framework: "net10.0"))]);
 
         var files = project.StagedFiles();
         await Assert.That(files.Count).IsEqualTo(3);
-        await Assert.That(File.ReadAllText(files.Single(_ => _.EndsWith(".received.txt"))))
+        await Assert.That(await File.ReadAllTextAsync(files.Single(_ => _.EndsWith(".received.txt"))))
             .IsEqualTo("second");
     }
 
@@ -82,7 +82,7 @@ public async Task SourceWithNoProjectAboveItIsSkipped()
         // stage, and skipped is better than a guess.
         var source = Path.Combine(Path.GetTempPath(), $"inline-staging-none-{Guid.NewGuid():N}", "SampleTests.cs");
 
-        var written = InlineStaging.Persist([new PendingInline(Patch(source, "content"))]);
+        var written = InlineStaging.Persist([new(Patch(source, "content"))]);
 
         await Assert.That(written).IsEqualTo(0);
     }
@@ -99,7 +99,7 @@ public async Task RemoveIsNeverPersisted()
             OriginalValue = "old"
         };
 
-        var written = InlineStaging.Persist([new PendingInline(remove)]);
+        var written = InlineStaging.Persist([new(remove)]);
 
         await Assert.That(written).IsEqualTo(0);
         await Assert.That(project.StagedFiles()).IsEmpty();
@@ -111,7 +111,7 @@ public async Task UnlabeledPatchStillPersists()
         using var project = new TempProject();
         var source = project.Source("SampleTests.cs");
 
-        var written = InlineStaging.Persist([new PendingInline(Patch(source, "content"))]);
+        var written = InlineStaging.Persist([new(Patch(source, "content"))]);
 
         await Assert.That(written).IsEqualTo(1);
         var patchFile = project.StagedFiles().Single(_ => _.EndsWith(".inlinepatch"));

src/DiffEngine.Tests/RequiresDotnetAttribute.cs

@@ -17,6 +17,7 @@ public override Task<bool> ShouldSkip(TestRegisteredContext context) =>
         var root = Environment.GetEnvironmentVariable("DOTNET_ROOT");
         if (!string.IsNullOrEmpty(root))
         {
+            // ReSharper disable once RedundantSuppressNullableWarningExpression
             var candidate = Path.Combine(root!, name);
             if (File.Exists(candidate))
             {

src/DiffEngine/Inline/FsStringLiteral.cs

@@ -62,7 +62,7 @@ public static string Render(string content, string indent, string eol)
     /// </summary>
     static bool CanTripleQuote(string content) =>
         content[0] != '"' &&
-        content[content.Length - 1] != '"' &&
+        content[^1] != '"' &&
         content.IndexOf("\"\"\"", StringComparison.Ordinal) == -1 &&
         !StringLiteral.HasLineTerminator(content);
 

src/DiffEngine/Inline/InlinePatcher.cs

@@ -734,6 +734,7 @@ static int Clamp(int line, int lineCount) =>
                 break;
             }
 
+            // ReSharper disable once RedundantSuppressNullableWarningExpression
             var end = index + memberName!.Length;
             if (scan.IsCode(index) &&
                 StartsToken(source, scan, index) &&
@@ -1109,7 +1110,7 @@ static string UnitFor(string fileUnit, string lead)
         // spaces for alignment continues in spaces: a tab there would advance to the next tab stop
         // from wherever the alignment left off, which is a different width in every editor. With
         // no indentation to read, follow the file
-        var tabs = lead.Length > 0 ? lead[lead.Length - 1] == '\t' : fileUsesTabs;
+        var tabs = lead.Length > 0 ? lead[^1] == '\t' : fileUsesTabs;
         if (tabs)
         {
             return "\t";

src/DiffEngine/Inline/InlineQueue.cs

@@ -120,8 +120,7 @@ static PendingInline Fold(PendingInline entry, InlinePatch patch)
             // throws away the completion of an accept whose entry changed identity while the
             // patch was applying, and a still failing test re-sending the same patch is exactly
             // what happens during those ten seconds
-            if (entry.Variants is [var only] &&
-                only.Origins.Count == 0 &&
+            if (entry.Variants is [{Origins.Count: 0} only] &&
                 only.Patch.Matches(patch))
             {
                 return Unchanged(entry);

src/DiffEngine/Inline/InlineStaging.cs

@@ -159,6 +159,7 @@ static string BuildName(InlinePatch patch, string? origin)
             return null;
         }
 
+        // ReSharper disable once RedundantSuppressNullableWarningExpression
         var builder = new StringBuilder(value!.Length);
         foreach (var character in value)
         {

src/DiffEngine/Inline/StringLiteral.cs

@@ -247,7 +247,7 @@ public static bool TryStripLayout(string text, [NotNullWhen(true)] out string? v
             return false;
         }
 
-        var closeIndent = lines[lines.Length - 1];
+        var closeIndent = lines[^1];
         if (closeIndent.Trim().Length > 0)
         {
             return false;
@@ -485,8 +485,7 @@ public static bool TryScanVerbatim(string text, int start, out string? value, ou
     /// </para>
     /// </summary>
     public static bool IsScalarValue(uint codePoint) =>
-        codePoint <= 0x10FFFF &&
-        codePoint is < 0xD800 or > 0xDFFF;
+        codePoint is <= 0x10FFFF and (< 0xD800 or > 0xDFFF);
 
     public static bool TryReadHex(string text, ref int index, int min, int max, out uint result)
     {