Refactor: Simplify InjectableData creation, adjust location handling in InjectableAnalyzer, and update COCDI001 severity

Author: AnnaSasDev

src/CodeOfChaos.Extensions.DependencyInjection.Generators/AnalyzerReleases.Shipped.md

@@ -1,10 +1,7 @@
-; Shipped analyzer releases
-; https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md
-
 ## Release 0.81.1
 
 ### New Rules
  Rule ID  | Category   | Severity | Notes                                                          
 ----------|------------|----------|----------------------------------------------------------------
- COCDI001 | Injectable | Warning  | Service does not implement the correct Injectable service type 
+ COCDI001 | Injectable | Error    | Service does not implement the correct Injectable service type 
 

src/CodeOfChaos.Extensions.DependencyInjection.Generators/AnalyzerReleases.Unshipped.md

@@ -0,0 +1,6 @@
+## Release 0.81.1
+
+### New Rules
+ Rule ID  | Category   | Severity | Notes                                                          
+----------|------------|----------|----------------------------------------------------------------
+

src/CodeOfChaos.Extensions.DependencyInjection.Generators/InjectableAnalyzer.cs

@@ -49,10 +49,10 @@ private static void AnalyzeClassDeclaration(SyntaxNodeAnalysisContext context) {
             if (serviceTypeSymbol is null) continue;
             if (DoesClassImplementOrInherit(classSymbol, serviceTypeSymbol)) continue;
 
+            Location location = classDeclaration.Identifier.GetLocation();
             var diagnostic = Diagnostic.Create(
                 Rule001,
-                context.Node.GetLocation(),
-                // injectableData.LocationInfo?.ToLocation(),
+                location,
                 injectableData.ClassName,
                 injectableData.ServiceTypeName
             );

src/CodeOfChaos.Extensions.DependencyInjection.Generators/InjectableData.cs

@@ -1,8 +1,6 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-using CodeOfChaos.GeneratorTools;
-using JetBrains.Annotations;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
@@ -20,8 +18,7 @@ public record InjectableData(
     ServiceLifetime ServiceLifetime,
     string? ServiceTypeName,
     object? ServiceKey,
-    bool ServiceKeyIsString,
-    [UsedImplicitly] LocationInfo? LocationInfo
+    bool ServiceKeyIsString
 ) {
     [MemberNotNullWhen(true, nameof(ServiceKey))] public bool HasServiceKey => ServiceKey is not null;
 
@@ -34,7 +31,7 @@ public static IEnumerable<InjectableData> FromInjectableAttribute(GeneratorAttri
 
         foreach (AttributeData attributeData in context.Attributes) {
             int lifetime = attributeData.ConstructorArguments[0].Value as int? ?? -1;
-            yield return ExtractServiceData(classSymbol, classDeclaration, attributeData, ServiceLifetimeUtlities.ToLifetime(lifetime), firstArgumentIndex: 1);
+            yield return ExtractServiceData(classSymbol, attributeData, ServiceLifetimeUtlities.ToLifetime(lifetime), firstArgumentIndex: 1);
         }
     }
 
@@ -45,7 +42,7 @@ public static IEnumerable<InjectableData> FromInjectableAttribute(GeneratorAttri
         if (context.SemanticModel.GetDeclaredSymbol(classDeclaration) is not INamedTypeSymbol classSymbol) yield break;
 
         foreach (AttributeData attributeData in context.Attributes) {
-            yield return ExtractServiceData(classSymbol, classDeclaration, attributeData, lifetime, firstArgumentIndex);
+            yield return ExtractServiceData(classSymbol, attributeData, lifetime, firstArgumentIndex);
         }
     }
 
@@ -62,44 +59,42 @@ public static IEnumerable<InjectableData> FromSyntaxAnalyzer(SyntaxNodeAnalysisC
             switch (fullMetadataName) {
                 case SourceCodes.InjectableAttributeMetadataName: {
                     int lifetime = attributeData.ConstructorArguments[0].Value as int? ?? -1;
-                    yield return ExtractServiceData(classSymbol, classDeclaration, attributeData, ServiceLifetimeUtlities.ToLifetime(lifetime), 1);
+                    yield return ExtractServiceData(classSymbol, attributeData, ServiceLifetimeUtlities.ToLifetime(lifetime), 1);
                     break;
                 }
 
                 case SourceCodes.InjectableSingletonAttributeMetadataName: {
-                    yield return ExtractServiceData(classSymbol, classDeclaration, attributeData, ServiceLifetime.Singleton, 1);
+                    yield return ExtractServiceData(classSymbol, attributeData, ServiceLifetime.Singleton, 1);
                     break;
                 }
 
                 case SourceCodes.InjectableScopedAttributeMetadataName: {
-                    yield return ExtractServiceData(classSymbol, classDeclaration, attributeData, ServiceLifetime.Scoped, 1);
+                    yield return ExtractServiceData(classSymbol, attributeData, ServiceLifetime.Scoped, 1);
                     break;
                 }
 
                 case SourceCodes.InjectableTransientAttributeMetadataName: {
-                    yield return ExtractServiceData(classSymbol, classDeclaration, attributeData, ServiceLifetime.Transient, 1);
+                    yield return ExtractServiceData(classSymbol, attributeData, ServiceLifetime.Transient, 1);
                     break;
                 }
             }
         }
     }
 
-    private static InjectableData ExtractServiceData(INamedTypeSymbol classSymbol, ClassDeclarationSyntax classDeclaration, AttributeData attributeData, ServiceLifetime lifetime, int firstArgumentIndex) {
+    private static InjectableData ExtractServiceData(INamedTypeSymbol classSymbol, AttributeData attributeData, ServiceLifetime lifetime, int firstArgumentIndex) {
         TypedConstant keyArgument = attributeData.ConstructorArguments.ElementAtOrDefault(firstArgumentIndex);
         ITypeSymbol? keyType = keyArgument.Type;
         object? keyObject = keyArgument.Value;
 
         string? serviceTypeName = attributeData.AttributeClass?.TypeArguments.First().ToString();
         string className = classSymbol.ToDisplayString();
-        LocationInfo? locationInfo = LocationInfo.From(classDeclaration.GetLocation());
 
         return new InjectableData(
             className,
             lifetime,
             serviceTypeName,
             keyObject,
-            keyType is { SpecialType: SpecialType.System_String },
-            locationInfo
+            keyType is { SpecialType: SpecialType.System_String }
         );
     }
 }