Automatically linting code

rsg-bot · web-flow · commit eadc05629ddd · 2026-03-01T20:56:26.000-05:00
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -1,90 +1,66 @@
 {
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "gitversion.tool": {
-      "version": "6.5.1",
-      "commands": [
-        "dotnet-gitversion"
-      ],
-      "rollForward": false
-    },
-    "dotnet-reportgenerator-globaltool": {
-      "version": "5.5.1",
-      "commands": [
-        "reportgenerator"
-      ],
-      "rollForward": false
-    },
-    "nuke.globaltool": {
-      "version": "10.1.0",
-      "commands": [
-        "nuke"
-      ],
-      "rollForward": false
-    },
-    "codecov.tool": {
-      "version": "1.13.0",
-      "commands": [
-        "codecov"
-      ],
-      "rollForward": false
-    },
-    "jetbrains.resharper.globaltools": {
-      "version": "2025.3.2",
-      "commands": [
-        "jb"
-      ],
-      "rollForward": false
-    },
-    "jetbrains.dotcover.commandlinetools": {
-      "version": "2025.3.2",
-      "commands": [
-        "dotCover"
-      ],
-      "rollForward": false
-    },
-    "jetbrains.dottrace.globaltools": {
-      "version": "2025.3.2",
-      "commands": [
-        "dottrace"
-      ],
-      "rollForward": false
-    },
-    "dotnet-coverage": {
-      "version": "18.4.1",
-      "commands": [
-        "dotnet-coverage"
-      ],
-      "rollForward": false
-    },
-    "dotnet-outdated-tool": {
-      "version": "4.7.0",
-      "commands": [
-        "dotnet-outdated"
-      ],
-      "rollForward": false
-    },
-    "husky": {
-      "version": "0.8.0",
-      "commands": [
-        "husky"
-      ],
-      "rollForward": false
-    },
-    "verify.tool": {
-      "version": "0.7.0",
-      "commands": [
-        "dotnet-verify"
-      ],
-      "rollForward": false
-    },
-    "gitreleasemanager.tool": {
-      "version": "0.20.0",
-      "commands": [
-        "dotnet-gitreleasemanager"
-      ],
-      "rollForward": false
+    "version": 1,
+    "isRoot": true,
+    "tools": {
+        "gitversion.tool": {
+            "version": "6.5.1",
+            "commands": ["dotnet-gitversion"],
+            "rollForward": false
+        },
+        "dotnet-reportgenerator-globaltool": {
+            "version": "5.5.1",
+            "commands": ["reportgenerator"],
+            "rollForward": false
+        },
+        "nuke.globaltool": {
+            "version": "10.1.0",
+            "commands": ["nuke"],
+            "rollForward": false
+        },
+        "codecov.tool": {
+            "version": "1.13.0",
+            "commands": ["codecov"],
+            "rollForward": false
+        },
+        "jetbrains.resharper.globaltools": {
+            "version": "2025.3.2",
+            "commands": ["jb"],
+            "rollForward": false
+        },
+        "jetbrains.dotcover.commandlinetools": {
+            "version": "2025.3.2",
+            "commands": ["dotCover"],
+            "rollForward": false
+        },
+        "jetbrains.dottrace.globaltools": {
+            "version": "2025.3.2",
+            "commands": ["dottrace"],
+            "rollForward": false
+        },
+        "dotnet-coverage": {
+            "version": "18.4.1",
+            "commands": ["dotnet-coverage"],
+            "rollForward": false
+        },
+        "dotnet-outdated-tool": {
+            "version": "4.7.0",
+            "commands": ["dotnet-outdated"],
+            "rollForward": false
+        },
+        "husky": {
+            "version": "0.8.0",
+            "commands": ["husky"],
+            "rollForward": false
+        },
+        "verify.tool": {
+            "version": "0.7.0",
+            "commands": ["dotnet-verify"],
+            "rollForward": false
+        },
+        "gitreleasemanager.tool": {
+            "version": "0.20.0",
+            "commands": ["dotnet-gitreleasemanager"],
+            "rollForward": false
+        }
     }
-  }
-}
+}
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,4 +1,4 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8" ?>
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
@@ -60,5 +60,8 @@
     <PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
     <PackageVersion Include="Verify.TUnit" Version="31.13.0" />
   </ItemGroup>
-  <Import Project="$(MSBuildThisFileDirectory)/Directory.Packages.support.props" Condition="Exists('$(MSBuildThisFileDirectory)/Directory.Packages.support.props')" />
+  <Import
+        Project="$(MSBuildThisFileDirectory)/Directory.Packages.support.props"
+        Condition="Exists('$(MSBuildThisFileDirectory)/Directory.Packages.support.props')"
+    />
 </Project>
diff --git a/src/DependencyInjection.Analyzers/Configuration/AssemblyProviderConfiguration.cs b/src/DependencyInjection.Analyzers/Configuration/AssemblyProviderConfiguration.cs
@@ -1,9 +1,11 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Text.Json;
+
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
+
 using Rocket.Surgery.DependencyInjection.Analyzers.AssemblyProviders;
 using Rocket.Surgery.DependencyInjection.Analyzers.Descriptors;
 
@@ -144,15 +146,15 @@ public static IEnumerable<AttributeListSyntax> ToAssemblyAttributes(
             yield return Helpers.AddAssemblyAttribute(ServiceDescriptorTypesKey, GetServiceDescriptorToString(context, request));
         }
     }
-    #pragma warning disable RS1035
+#pragma warning disable RS1035
     internal ResolvedSourceLocation? CacheSourceLocation(SourceLocation location, IAssemblySymbol assemblySymbol, Func<ResolvedSourceLocation?> factory)
     {
         if (generatedJson.GetSourceLocation(assemblySymbol, location, factory) is not { } savedLocation) return null;
 
         resultingJson.AddSourceLocation(assemblySymbol, savedLocation);
         return savedLocation;
     }
-    #pragma warning restore RS1035
+#pragma warning restore RS1035
 
     private static string CompressString(byte[] bytes) => Convert.ToBase64String(bytes);
 
@@ -199,7 +201,7 @@ private static GetAssemblyConfiguration GetAssemblyCollectionData(AssemblyCollec
         return data;
     }
 
-    #pragma warning disable RS1035
+#pragma warning disable RS1035
     private void GetAssemblyExpressionData(
         IAssemblySymbol assembly,
         out ImmutableList<AssemblyCollection.Item> assemblyItems,
@@ -222,9 +224,9 @@ ImmutableDictionary<string, IAssemblySymbol> assemblySymbols
         if (generatedJson.GetAssemblyData(assembly) is { } generatedData)
         {
             resultingJson.AddExpressionData(assembly, generatedData);
-            assemblyItems = generatedData.InternalAssemblyRequests.Select(z => GetAssembliesFromData(assemblySymbols, z)).ToImmutableList();
-            reflection = generatedData.InternalReflectionRequests.Select(z => GetReflectionFromData(compilation, assemblySymbols, z)).ToImmutableList();
-            serviceDescriptor = generatedData.InternalServiceDescriptorRequests.Select(z => GetServiceDescriptorFromData(compilation, assemblySymbols, z)).ToImmutableList();
+            assemblyItems = [.. generatedData.InternalAssemblyRequests.Select(z => GetAssembliesFromData(assemblySymbols, z))];
+            reflection = [.. generatedData.InternalReflectionRequests.Select(z => GetReflectionFromData(compilation, assemblySymbols, z))];
+            serviceDescriptor = [.. generatedData.InternalServiceDescriptorRequests.Select(z => GetServiceDescriptorFromData(compilation, assemblySymbols, z))];
             excludeFromResolution = generatedData.ExcludeFromResolution;
             return;
         }
@@ -290,9 +292,9 @@ ImmutableDictionary<string, IAssemblySymbol> assemblySymbols
         serviceDescriptor = serviceDescriptorBuilder.ToImmutable();
 
         var result = new CompiledAssemblyProviderData(
-            assemblyBuilder.Select(GetAssemblyCollectionData).ToImmutableList(),
-            reflectionBuilder.Select(GetReflectionCollectionData).ToImmutableList(),
-            serviceDescriptorBuilder.Select(z => GetServiceDescriptorCollectionData(context, z)).ToImmutableList(),
+            [.. assemblyBuilder.Select(GetAssemblyCollectionData)],
+            [.. reflectionBuilder.Select(GetReflectionCollectionData)],
+            [.. serviceDescriptorBuilder.Select(z => GetServiceDescriptorCollectionData(context, z))],
             excludeFromResolution,
             assembly.GetCachedVersion()
         );
@@ -302,7 +304,7 @@ ImmutableDictionary<string, IAssemblySymbol> assemblySymbols
         else
             resultingJson.AddExpressionData(assembly, result);
     }
-    #pragma warning restore RS1035
+#pragma warning restore RS1035
 
     private static GetReflectionCollectionData GetReflectionCollectionData(ReflectionCollection.Item item)
     {
@@ -441,18 +443,18 @@ ImmutableDictionary<string, IAssemblySymbol> assemblySymbols
         foreach (var item in data.ServiceTypeDescriptors)
         {
             IServiceTypeDescriptor serviceTypeDescriptor = item switch
-                                                           {
-                                                               { Identifier: 'c', TypeData: { } typeData } when findType(assemblySymbols, compilation, typeData.Assembly, typeData.Type) is { } type =>
-                                                                   new CompiledServiceTypeDescriptor(type),
-                                                               { Identifier: 'c', TypeData: { } typeData } => new UnknownCompiledServiceTypeDescriptor(typeData),
-                                                               { Identifier: 'i', TypeFilter: { } typeFilter } =>
-                                                                   new ImplementedInterfacesServiceTypeDescriptor(LoadTypeFilter(compilation, typeFilter, source, assemblySymbols)),
-                                                               { Identifier: 'i' } => new ImplementedInterfacesServiceTypeDescriptor(null),
-                                                               { Identifier: 'm' } => new MatchingInterfaceServiceTypeDescriptor(),
-                                                               { Identifier: 's' } => new SelfServiceTypeDescriptor(),
-                                                               { Identifier: 'a' } => new AsTypeFilterServiceTypeDescriptor(),
-                                                               _                   => throw new ArgumentOutOfRangeException(nameof(data), data, $"The type name was {data.GetType().FullName}"),
-                                                           };
+            {
+                { Identifier: 'c', TypeData: { } typeData } when findType(assemblySymbols, compilation, typeData.Assembly, typeData.Type) is { } type =>
+                    new CompiledServiceTypeDescriptor(type),
+                { Identifier: 'c', TypeData: { } typeData } => new UnknownCompiledServiceTypeDescriptor(typeData),
+                { Identifier: 'i', TypeFilter: { } typeFilter } =>
+                    new ImplementedInterfacesServiceTypeDescriptor(LoadTypeFilter(compilation, typeFilter, source, assemblySymbols)),
+                { Identifier: 'i' } => new ImplementedInterfacesServiceTypeDescriptor(null),
+                { Identifier: 'm' } => new MatchingInterfaceServiceTypeDescriptor(),
+                { Identifier: 's' } => new SelfServiceTypeDescriptor(),
+                { Identifier: 'a' } => new AsTypeFilterServiceTypeDescriptor(),
+                _ => throw new ArgumentOutOfRangeException(nameof(data), data, $"The type name was {data.GetType().FullName}"),
+            };
             descriptors.Add(
                 serviceTypeDescriptor
             );
@@ -486,16 +488,16 @@ CompiledServiceTypeDescriptors serviceTypeDescriptors
                                                               TypeFilter: i is { InterfaceFilter: { } filter } ? LoadTypeFilterData(filter) : null
                                                           ),
                                                           MatchingInterfaceServiceTypeDescriptor => new('m'),
-                                                          SelfServiceTypeDescriptor              => new('s'),
-                                                          AsTypeFilterServiceTypeDescriptor      => new('a'),
+                                                          SelfServiceTypeDescriptor => new('s'),
+                                                          AsTypeFilterServiceTypeDescriptor => new('a'),
                                                           CompiledServiceTypeDescriptor { Type: { } namedType } => new ServiceTypeData(
                                                               'c',
                                                               new(namedType.ContainingAssembly.MetadataName, namedType.MetadataName, namedType.IsUnboundGenericType)
                                                           ),
                                                           _ => throw new ArgumentOutOfRangeException(nameof(descriptor), descriptor, $"The type name was {descriptor.GetType().FullName}"),
                                                       }
                                  );
-        return new(serviceDescriptors.ToImmutableArray(), serviceTypeDescriptors.Lifetime);
+        return new([.. serviceDescriptors], serviceTypeDescriptors.Lifetime);
     }
 
     private static CompiledTypeFilter LoadTypeFilter(
@@ -597,14 +599,13 @@ ImmutableDictionary<string, IAssemblySymbol> assemblySymbols
 
     private static TypeFilterData LoadTypeFilterData(CompiledTypeFilter typeFilter) => new(
         typeFilter.ClassFilter,
-        typeFilter
+        [.. typeFilter
            .TypeFilterDescriptors
            .OfType<NamespaceFilterDescriptor>()
            .Select(static z => new NamespaceFilterData(z.Filter, [.. z.Namespaces.OrderBy(z => z)]))
            .OrderBy(static z => string.Join(",", z.Namespaces.OrderBy(static z => z)))
            .ThenBy(static z => z.Filter)
-           .Select(static z => z with { Namespaces = [.. z.Namespaces.OrderBy(z => z)] })
-           .ToImmutableArray(),
+           .Select(static z => z with { Namespaces = [.. z.Namespaces.OrderBy(z => z)] })],
         [
             .. typeFilter
               .TypeFilterDescriptors.OfType<NameFilterDescriptor>()
diff --git a/src/DependencyInjection.Analyzers/Rocket.Surgery.DependencyInjection.Analyzers.csproj b/src/DependencyInjection.Analyzers/Rocket.Surgery.DependencyInjection.Analyzers.csproj
@@ -11,12 +11,21 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
     <PackageReference Include="Polyfill" PrivateAssets="all" />
     <PackageReference Include="System.Text.Json" PrivateAssets="all" />
-    <ProjectReference Include="../DependencyInjection.Analyzers.roslyn4.8/Rocket.Surgery.DependencyInjection.Analyzers.roslyn4.8.csproj" PrivateAssets="all" ReferenceOutputAssembly="false" />
+    <ProjectReference
+            Include="../DependencyInjection.Analyzers.roslyn4.8/Rocket.Surgery.DependencyInjection.Analyzers.roslyn4.8.csproj"
+            PrivateAssets="all"
+            ReferenceOutputAssembly="false"
+        />
   </ItemGroup>
   <ItemGroup>
     <None Include="bin\$(Configuration)\netstandard2.0\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.14/cs" Visible="false" />
     <None Include="$(PkgSystem_Text_Json)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.14/cs" Visible="false" />
-    <None Include="..\DependencyInjection.Analyzers.roslyn4.8\bin\$(Configuration)\netstandard2.0\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.8/cs" Visible="false" />
+    <None
+            Include="..\DependencyInjection.Analyzers.roslyn4.8\bin\$(Configuration)\netstandard2.0\$(AssemblyName).dll"
+            Pack="true"
+            PackagePath="analyzers/dotnet/roslyn4.8/cs"
+            Visible="false"
+        />
     <None Include="$(PkgSystem_Text_Json)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.8/cs" Visible="false" />
   </ItemGroup>
 </Project>
diff --git a/test/DependencyInjection.Analyzers.Tests/VerifyExtensions.cs b/test/DependencyInjection.Analyzers.Tests/VerifyExtensions.cs
@@ -1,5 +1,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
+
 using Rocket.Surgery.Extensions.Testing.SourceGenerators;
 
 namespace Rocket.Surgery.DependencyInjection.Analyzers.Tests;
diff --git a/test/Extensions.Tests/BindingTests.cs b/test/Extensions.Tests/BindingTests.cs
@@ -1,8 +1,11 @@
 #nullable disable
 using System.Reflection;
+
 using Microsoft.Extensions.Configuration;
+
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+
 using Rocket.Surgery.Binding;
 using Rocket.Surgery.Extensions.Testing;
 
@@ -311,7 +314,6 @@ public Task BindsTo_ArrayProperties(BindDelegate @delegate)
         };
         var result = (ArrayProperties)@delegate(binder, typeof(ArrayProperties), JsonBinder.DefaultSerializer, keyValuePairs);
 
-
         return Verify(new { result, bindingResult = binder.From(result) }).UseParameters(TUnit.Core.TestContext.Current?.Metadata.TestDetails.TestId);
     }
 
diff --git a/test/Extensions.Tests/Encoding/Base3264EncodingTests.cs b/test/Extensions.Tests/Encoding/Base3264EncodingTests.cs
@@ -39,7 +39,7 @@ public async Task TestAssymetricAlphabet()
     {
         var b32 = new Base32Url(false, true, true, Base32Url.Base32CrockfordHumanFriendlyAlphabet);
 
-        var s = "Hello World!";
+        const string s = "Hello World!";
         var b = System.Text.Encoding.UTF8.GetBytes(s);
         var enc = b32.Encode(b);
 
@@ -81,7 +81,7 @@ public async Task TestBadAlphabetAllowedIfCS()
     public async Task TestMethods()
     {
         var enc = System.Text.Encoding.UTF8;
-        var stringIn = "Hello World!";
+        const string stringIn = "Hello World!";
         var bytes = enc.GetBytes(stringIn);
 
         await Assert.That(Base3264Encoding.ToBase64(bytes)).IsEqualTo("SGVsbG8gV29ybGQh");

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public async Task TestAssymetricAlphabet()`
`39`	`39`	`{`
`40`	`40`	`var b32 = new Base32Url(false, true, true, Base32Url.Base32CrockfordHumanFriendlyAlphabet);`
`41`	`41`
`42`		`- var s = "Hello World!";`
	`42`	`+ const string s = "Hello World!";`
`43`	`43`	`var b = System.Text.Encoding.UTF8.GetBytes(s);`
`44`	`44`	`var enc = b32.Encode(b);`
`45`	`45`
`@@ -81,7 +81,7 @@ public async Task TestBadAlphabetAllowedIfCS()`
`81`	`81`	`public async Task TestMethods()`
`82`	`82`	`{`
`83`	`83`	`var enc = System.Text.Encoding.UTF8;`
`84`		`- var stringIn = "Hello World!";`
	`84`	`+ const string stringIn = "Hello World!";`
`85`	`85`	`var bytes = enc.GetBytes(stringIn);`
`86`	`86`
`87`	`87`	`await Assert.That(Base3264Encoding.ToBase64(bytes)).IsEqualTo("SGVsbG8gV29ybGQh");`