Code cleanup

DevTeam · Mar 14, 2024 · 8e96a62 · 8e96a62
1 parent 1a3212e
commit 8e96a62
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 13 deletions.
diff --git a/src/Pure.DI.Core/Core/ArgDependencyNodeBuilder.cs b/src/Pure.DI.Core/Core/ArgDependencyNodeBuilder.cs
@@ -1,4 +1,5 @@
-namespace Pure.DI.Core;
+// ReSharper disable ClassNeverInstantiated.Global
+namespace Pure.DI.Core;
 
 internal sealed class ArgDependencyNodeBuilder : IBuilder<MdSetup, IEnumerable<DependencyNode>>
 {

diff --git a/src/Pure.DI.Core/Core/Arguments.cs b/src/Pure.DI.Core/Core/Arguments.cs
@@ -1,4 +1,5 @@
-namespace Pure.DI.Core;
+// ReSharper disable ClassNeverInstantiated.Global
+namespace Pure.DI.Core;
 
 internal class Arguments : IArguments
 {

diff --git a/src/Pure.DI.Core/Core/BaseSymbolsProvider.cs b/src/Pure.DI.Core/Core/BaseSymbolsProvider.cs
@@ -1,13 +1,20 @@
-namespace Pure.DI.Core;
+// ReSharper disable ClassNeverInstantiated.Global
+namespace Pure.DI.Core;
 
 internal class BaseSymbolsProvider : IBaseSymbolsProvider
 {
     public IEnumerable<ITypeSymbol> GetBaseSymbols(ITypeSymbol symbol, int deep = int.MaxValue)
     {
+        if (deep < 0)
+        {
+            yield break;
+        }
+
+        deep--;
         while (true)
         {
             yield return symbol;
-            foreach (var type in symbol.AllInterfaces.SelectMany(i => GetBaseSymbols(i, --deep)))
+            foreach (var type in symbol.AllInterfaces.SelectMany(i => GetBaseSymbols(i, deep)))
             {
                 yield return type;
             }

diff --git a/src/Pure.DI.Core/Core/Code/ClassDiagramBuilder.cs b/src/Pure.DI.Core/Core/Code/ClassDiagramBuilder.cs
@@ -176,10 +176,10 @@ private string FormatInjection(Injection injection, FormatOptions options) =>
     private string FormatDependency(Dependency dependency, FormatOptions options) => 
         $"{(dependency.Injection.Tag == default ? "" : FormatTag(dependency.Injection.Tag) + " ")}{FormatSymbol(dependency.Injection.Type, options)}";
 
-    private string FormatTag(object? tag) =>
+    private static string FormatTag(object? tag) =>
         tag != default ? $"{tag.ValueToString("").Replace("\"", "\\\"")} " : "";
 
-    private string FormatTags(IEnumerable<object?> tags) =>
+    private static string FormatTags(IEnumerable<object?> tags) =>
         string.Join(", ", tags.Distinct().Select(FormatTag).OrderBy(i => i));
 
     private string FormatSymbol(ISymbol? symbol, FormatOptions options) =>
@@ -238,7 +238,7 @@ private string FormatType(ISymbol? symbol, FormatOptions options)
         string FormatSymbolLocal(ITypeSymbol i) => FormatSymbol(i, options);
     }
 
-    private string Format(Accessibility accessibility) =>
+    private static string Format(Accessibility accessibility) =>
         accessibility switch
         {
             Accessibility.NotApplicable => "",

diff --git a/src/Pure.DI.Core/Core/Code/Comments.cs b/src/Pure.DI.Core/Core/Code/Comments.cs
@@ -1,4 +1,5 @@
-namespace Pure.DI.Core.Code;
+// ReSharper disable ClassNeverInstantiated.Global
+namespace Pure.DI.Core.Code;
 
 using System.Text.RegularExpressions;
 

diff --git a/src/Pure.DI.Core/Core/Code/Formatter.cs b/src/Pure.DI.Core/Core/Code/Formatter.cs
@@ -1,4 +1,5 @@
-namespace Pure.DI.Core.Code;
+// ReSharper disable ClassNeverInstantiated.Global
+namespace Pure.DI.Core.Code;
 
 internal class Formatter(
     ITypeResolver typeResolver,

diff --git a/src/Pure.DI.Core/Core/Code/RootMethodsBuilder.cs b/src/Pure.DI.Core/Core/Code/RootMethodsBuilder.cs
@@ -80,7 +80,6 @@ private void BuildRoot(CompositionCode composition, Root root)
         name.Append(root.DisplayName);
 
         var typeArgs = root.TypeDescription.TypeArgs;
-        var constraints = new List<string>();
         if (typeArgs.Count > 0)
         {
             name.Append('<');

diff --git a/src/Pure.DI.Core/Core/Code/TypeDescription.cs b/src/Pure.DI.Core/Core/Code/TypeDescription.cs
@@ -6,4 +6,4 @@ public readonly record struct TypeDescription(
     ITypeParameterSymbol? TypeParam)
 {
     public override string ToString() => Name;
-};
+}
diff --git a/src/Pure.DI.Core/Core/Code/TypeResolver.cs b/src/Pure.DI.Core/Core/Code/TypeResolver.cs
@@ -1,4 +1,5 @@
-namespace Pure.DI.Core.Code;
+// ReSharper disable ClassNeverInstantiated.Global
+namespace Pure.DI.Core.Code;
 
 internal class TypeResolver(IMarker marker)
     : ITypeResolver

diff --git a/src/Pure.DI.Core/Core/ConstructDependencyNodeBuilder.cs b/src/Pure.DI.Core/Core/ConstructDependencyNodeBuilder.cs
@@ -1,4 +1,5 @@
 // ReSharper disable ForeachCanBeConvertedToQueryUsingAnotherGetEnumerator
+// ReSharper disable ClassNeverInstantiated.Global
 namespace Pure.DI.Core;
 
 internal sealed class ConstructDependencyNodeBuilder : IBuilder<MdSetup, IEnumerable<DependencyNode>>

diff --git a/src/Pure.DI.Core/Core/FactoryDependencyNodeBuilder.cs b/src/Pure.DI.Core/Core/FactoryDependencyNodeBuilder.cs
@@ -1,4 +1,5 @@
 // ReSharper disable ForeachCanBeConvertedToQueryUsingAnotherGetEnumerator
+// ReSharper disable ClassNeverInstantiated.Global
 namespace Pure.DI.Core;
 
 internal sealed class FactoryDependencyNodeBuilder : IBuilder<MdSetup, IEnumerable<DependencyNode>>

diff --git a/src/Pure.DI.Core/Core/ImplementationDependencyNodeBuilder.cs b/src/Pure.DI.Core/Core/ImplementationDependencyNodeBuilder.cs
@@ -1,6 +1,7 @@
 // ReSharper disable ForeachCanBeConvertedToQueryUsingAnotherGetEnumerator
 // ReSharper disable ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
 // ReSharper disable ConvertToAutoPropertyWhenPossible
+// ReSharper disable ClassNeverInstantiated.Global
 namespace Pure.DI.Core;
 
 internal sealed class ImplementationDependencyNodeBuilder(

diff --git a/src/Pure.DI.Core/Core/Profiler.cs b/src/Pure.DI.Core/Core/Profiler.cs
@@ -1,4 +1,5 @@
-namespace Pure.DI.Core;
+// ReSharper disable ClassNeverInstantiated.Global
+namespace Pure.DI.Core;
 
 using System.Diagnostics;
 

diff --git a/src/Pure.DI.Core/Core/RootDependencyNodeBuilder.cs b/src/Pure.DI.Core/Core/RootDependencyNodeBuilder.cs
@@ -1,3 +1,4 @@
+// ReSharper disable ClassNeverInstantiated.Global
 namespace Pure.DI.Core;
 
 internal sealed class RootDependencyNodeBuilder : IBuilder<MdSetup, IEnumerable<DependencyNode>>

diff --git a/src/Pure.DI.Core/Source.cs b/src/Pure.DI.Core/Source.cs
@@ -1,3 +1,4 @@
+// ReSharper disable NotAccessedPositionalProperty.Global
 namespace Pure.DI;
 
 public readonly record struct Source(
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ public readonly record struct TypeDescription( @@
         ITypeParameterSymbol? TypeParam)
     {
         public override string ToString() => Name;
-    };
+    }