nested types can be annoying, so lets fix that (#1343)

RocketSurgeonsGuild · Nov 28, 2024 · 204d4e9 · 204d4e9
1 parent 1b44247
commit 204d4e9
Show file tree

Hide file tree

Showing 82 changed files with 1,118 additions and 297 deletions.
diff --git a/src/DependencyInjection.Analyzers/AssemblyProviders/CompiledTypeFilter.cs b/src/DependencyInjection.Analyzers/AssemblyProviders/CompiledTypeFilter.cs
@@ -122,6 +122,7 @@ static bool TypeInfoFilterFunc(TypeInfoFilter typeFilter, INamedTypeSymbol type)
                        TypeInfoFilter.Sealed    => type.IsSealed,
                        TypeInfoFilter.Visible   => type.DeclaredAccessibility == Accessibility.Public,
                        TypeInfoFilter.ValueType => type.IsValueType,
+                       TypeInfoFilter.Static    => type.IsStatic,
 //                TypeInfoFilter.Nested                => type.ContainingType is {},
                        TypeInfoFilter.Unknown => throw new NotSupportedException(typeFilter.ToString()),
                        _                      => throw new NotSupportedException(typeFilter.ToString()),

diff --git a/src/DependencyInjection.Analyzers/Descriptors/TypeInfoFilter.cs b/src/DependencyInjection.Analyzers/Descriptors/TypeInfoFilter.cs
@@ -44,4 +44,9 @@ internal enum TypeInfoFilter
 //    ///   The type is a generic type definition.
 //    /// </summary>
 //    GenericTypeDefinition = 7,
+
+    /// <summary>
+    ///     The type is static.
+    /// </summary>
+    Static = -2,
 }
diff --git a/src/DependencyInjection.Analyzers/ServiceDescriptorCollection.cs b/src/DependencyInjection.Analyzers/ServiceDescriptorCollection.cs
@@ -77,7 +77,7 @@ internal static ImmutableArray<Item> GetTypeDetails(
                 List<ITypeFilterDescriptor> typeFilters =
                 [
                     new TypeKindFilterDescriptor(true, ImmutableHashSet.Create(TypeKind.Class)),
-                    new TypeInfoFilterDescriptor(false, ImmutableHashSet.Create(TypeInfoFilter.Abstract)),
+                    new TypeInfoFilterDescriptor(false, ImmutableHashSet.Create(TypeInfoFilter.Abstract, TypeInfoFilter.Static)),
                 ];
                 List<IServiceTypeDescriptor> serviceDescriptors = new();
                 var classFilter = ClassFilter.All;

diff --git a/src/DependencyInjection.Analyzers/StatementGeneration.cs b/src/DependencyInjection.Analyzers/StatementGeneration.cs
@@ -29,7 +29,9 @@ string lifetime
                             IdentifierName("a"),
                             GenericName("GetRequiredService")
                                .WithTypeArgumentList(
-                                    TypeArgumentList(SingletonSeparatedList<TypeSyntax>(IdentifierName(Helpers.GetGenericDisplayName(implementationType))))
+                                    TypeArgumentList(
+                                        SingletonSeparatedList<TypeSyntax>(IdentifierName(Helpers.GetGenericDisplayName(implementationType).Replace("+", ".")))
+                                    )
                                 )
                         )
                     )
@@ -101,61 +103,22 @@ string lifetime
     )
     {
         var isServiceTypeAccessible = compilation.IsSymbolAccessibleWithin(serviceType, compilation.Assembly);
-
-        /* Unmerged change from project 'Rocket.Surgery.DependencyInjection.Analyzers.roslyn4.8'
-        Before:
-                return ( isServiceTypeAccessible, serviceTypeExpression, implementationTypeExpression ) switch
-                       {
-                           (true, TypeOfExpressionSyntax { Type: { } serviceTypeSyntax }, TypeOfExpressionSyntax { Type: { } implementationTypeSyntax })
-        After:
-                return ( isServiceTypeAccessible, serviceTypeExpression, implementationTypeExpression) switch
-                {
-                    (true, TypeOfExpressionSyntax { Type: { } serviceTypeSyntax }, TypeOfExpressionSyntax { Type: { } implementationTypeSyntax })
-        */
         return ( isServiceTypeAccessible, serviceTypeExpression, implementationTypeExpression ) switch
                {
                    (true, TypeOfExpressionSyntax { Type: { } serviceTypeSyntax }, TypeOfExpressionSyntax { Type: { } implementationTypeSyntax })
                        when !IsOpenGenericType(serviceType)
                     && !IsOpenGenericType(implementationType)
                     && compilation.IsSymbolAccessibleWithin(implementationType, compilation.Assembly)
                        => InvocationExpression(
-                           /* Unmerged change from project 'Rocket.Surgery.DependencyInjection.Analyzers.roslyn4.8'
-                           Before:
-                                                      MemberAccessExpression(
-                                                          SyntaxKind.SimpleMemberAccessExpression,
-                           After:
-                                               MemberAccessExpression(
-                                                   SyntaxKind.SimpleMemberAccessExpression,
-                           */
                            MemberAccessExpression(
                                SyntaxKind.SimpleMemberAccessExpression,
                                IdentifierName("ServiceDescriptor"),
                                GenericName(lifetime)
                                   .WithTypeArgumentList(TypeArgumentList(SeparatedList([serviceTypeSyntax, implementationTypeSyntax])))
-                               /* Unmerged change from project 'Rocket.Surgery.DependencyInjection.Analyzers.roslyn4.8'
-                               Before:
-                                                          )
-                                                      ),
-                                                  (true, TypeOfExpressionSyntax { Type: { } serviceTypeSyntax }, SimpleLambdaExpressionSyntax { ExpressionBody: {} })
-                               After:
-                                                   )
-                                               ),
-                                           (true, TypeOfExpressionSyntax { Type: { } serviceTypeSyntax }, SimpleLambdaExpressionSyntax { ExpressionBody: {} })
-                               */
                            )
                        ),
                    (true, TypeOfExpressionSyntax { Type: { } serviceTypeSyntax }, SimpleLambdaExpressionSyntax { ExpressionBody: { } })
                        when !IsOpenGenericType(serviceType) =>
-                       /* Unmerged change from project 'Rocket.Surgery.DependencyInjection.Analyzers.roslyn4.8'
-                       Before:
-                                              InvocationExpression(
-                                                      MemberAccessExpression(
-                                                          SyntaxKind.SimpleMemberAccessExpression,
-                       After:
-                                       InvocationExpression(
-                                               MemberAccessExpression(
-                                                   SyntaxKind.SimpleMemberAccessExpression,
-                       */
                        InvocationExpression(
                                MemberAccessExpression(
                                    SyntaxKind.SimpleMemberAccessExpression,

diff --git a/src/DependencyInjection.Extensions/Compiled/TypeInfoFilter.cs b/src/DependencyInjection.Extensions/Compiled/TypeInfoFilter.cs
@@ -44,4 +44,9 @@ public enum TypeInfoFilter
 //    ///   The type is a generic type definition.
 //    /// </summary>
 //    GenericTypeDefinition = 7,
-}
+
+    /// <summary>
+    ///     The type is static.
+    /// </summary>
+    Static = -2,
+}
diff --git a/src/DependencyInjection.Extensions/CompiledTypeProviderServiceCollectionExtensions.cs b/src/DependencyInjection.Extensions/CompiledTypeProviderServiceCollectionExtensions.cs
@@ -17,6 +17,7 @@ public static class CompiledTypeProviderServiceCollectionExtensions
     /// <returns></returns>
     public static IServiceCollection AddCompiledServiceRegistrations(this IServiceCollection services, ICompiledTypeProvider provider)
     {
+        // This is implied to ignore abstract and static classes.
         return provider.Scan(
             services,
             z => z

diff --git a/test/DependencyInjection.Analyzers.Tests/GetTypesTestsData.cs b/test/DependencyInjection.Analyzers.Tests/GetTypesTestsData.cs
@@ -95,6 +95,30 @@ public static IEnumerable<Func<GetTypesItem>> GetTypesData()
                          .NotStartsWith("Polyfill")
                  )
         );
+        yield return TestMethod(
+            z => z
+                .FromAssemblies()
+                .NotFromAssemblyOf<ServiceRegistrationAttribute>()
+                .GetTypes(
+                     x => x
+                         .NotAssignableTo<ICompiledTypeProvider>()
+                         .InfoOf(TypeInfoFilter.Static)
+                         .NotInNamespaces("JetBrains.Annotations", "Polyfills", "System")
+                         .NotStartsWith("Polyfill")
+                 )
+        );
+        yield return TestMethod(
+            z => z
+                .FromAssemblies()
+                .NotFromAssemblyOf<ServiceRegistrationAttribute>()
+                .GetTypes(
+                     x => x
+                         .NotAssignableTo<ICompiledTypeProvider>()
+                         .NotInfoOf(TypeInfoFilter.Static)
+                         .NotInNamespaces("JetBrains.Annotations", "Polyfills", "System")
+                         .NotStartsWith("Polyfill")
+                 )
+        );
         yield return TestMethod(
             z => z
                 .FromAssemblies()