.

Author: SimonCropp

src/GraphQL.EntityFramework.Analyzers.Tests/FieldBuilderResolveAnalyzerTests.cs

@@ -1,11 +1,4 @@
-using GraphQL.EntityFramework.Analyzers;
-using GraphQL.Types;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.EntityFrameworkCore;
-
-namespace GraphQL.EntityFramework.Tests;
+using GraphQL.EntityFramework;
 
 public class FieldBuilderResolveAnalyzerTests
 {
@@ -205,7 +198,7 @@ public ChildGraphType(IEfGraphQLService<TestDbContext> graphQlService) : base(gr
         var diagnostics = await GetDiagnosticsAsync(source);
         // Should warn because Name, Age, IsActive, CreatedDate are scalar properties, not PK/FK
         Assert.Equal(2, diagnostics.Length); // Two Resolve calls
-        Assert.All(diagnostics, d => Assert.Equal("GQLEF002", d.Id));
+        Assert.All(diagnostics, _ => Assert.Equal("GQLEF002", _.Id));
     }
 
     [Fact]
@@ -388,13 +381,18 @@ static async Task<Diagnostic[]> GetDiagnosticsAsync(string source)
 
         // Add specific assemblies we need, avoiding conflicts
         var requiredAssemblies = new[]
-        {
-            typeof(object).Assembly, // System.Private.CoreLib
-            typeof(Console).Assembly, // System.Console
-            typeof(IEfGraphQLService<>).Assembly, // GraphQL.EntityFramework
-            typeof(DbContext).Assembly, // EF Core
-            typeof(ObjectGraphType).Assembly, // GraphQL
-            typeof(IQueryable<>).Assembly, // System.Linq.Expressions
+        { // System.Private.CoreLib
+            typeof(object).Assembly,
+            // System.Console
+            typeof(Console).Assembly,
+            // GraphQL.EntityFramework
+            typeof(IEfGraphQLService<>).Assembly,
+            // EF Core
+            typeof(DbContext).Assembly,
+            // GraphQL
+            typeof(ObjectGraphType).Assembly,
+            // System.Linq.Expressions
+            typeof(IQueryable<>).Assembly,
         };
 
         foreach (var assembly in requiredAssemblies)
@@ -410,20 +408,23 @@ static async Task<Diagnostic[]> GetDiagnosticsAsync(string source)
         {
             if (!assembly.IsDynamic &&
                 !string.IsNullOrEmpty(assembly.Location) &&
-                !references.Any(r => r.Display == assembly.Location))
+                references.All(_ => _.Display != assembly.Location))
             {
                 var name = assembly.GetName().Name ?? "";
-                if ((name.StartsWith("System.") || name.StartsWith("Microsoft.")) &&
-                    !name.Contains("xunit", StringComparison.OrdinalIgnoreCase))
+                if ((!name.StartsWith("System.") &&
+                     !name.StartsWith("Microsoft.")) ||
+                    name.Contains("xunit", StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                try
+                {
+                    references.Add(MetadataReference.CreateFromFile(assembly.Location));
+                }
+                catch
                 {
-                    try
-                    {
-                        references.Add(MetadataReference.CreateFromFile(assembly.Location));
-                    }
-                    catch
-                    {
-                        // Ignore assemblies that can't be referenced
-                    }
+                    // Ignore assemblies that can't be referenced
                 }
             }
         }
@@ -442,16 +443,16 @@ static async Task<Diagnostic[]> GetDiagnosticsAsync(string source)
         var allDiagnostics = await compilationWithAnalyzers.GetAllDiagnosticsAsync();
 
         // Check for compilation errors
-        var compilationErrors = allDiagnostics.Where(d => d.Severity == DiagnosticSeverity.Error).ToArray();
+        var compilationErrors = allDiagnostics.Where(_ => _.Severity == DiagnosticSeverity.Error).ToArray();
         if (compilationErrors.Length > 0)
         {
-            var errorMessages = string.Join("\n", compilationErrors.Select(e => $"{e.Id}: {e.GetMessage()}"));
+            var errorMessages = string.Join("\n", compilationErrors.Select(_ => $"{_.Id}: {_.GetMessage()}"));
             throw new($"Compilation errors:\n{errorMessages}");
         }
 
         // Filter to only GQLEF002 diagnostics
         return allDiagnostics
-            .Where(d => d.Id == "GQLEF002")
+            .Where(_ => _.Id == "GQLEF002")
             .ToArray();
     }
 }

src/GraphQL.EntityFramework.Analyzers.Tests/GlobalUsings.cs

@@ -1 +1,7 @@
+global using GraphQL.EntityFramework.Analyzers;
+global using GraphQL.Types;
+global using Microsoft.CodeAnalysis;
+global using Microsoft.CodeAnalysis.CSharp;
+global using Microsoft.CodeAnalysis.Diagnostics;
+global using Microsoft.EntityFrameworkCore;
 global using Xunit;

src/GraphQL.EntityFramework.Analyzers/FieldBuilderResolveAnalyzer.cs

@@ -155,8 +155,7 @@ static bool AccessesNavigationProperties(LambdaExpressionSyntax lambda, Semantic
 
         // Find all member access expressions in the lambda
         var memberAccesses = body.DescendantNodesAndSelf()
-            .OfType<MemberAccessExpressionSyntax>()
-            .ToList();
+            .OfType<MemberAccessExpressionSyntax>();
 
         foreach (var memberAccess in memberAccesses)
         {
@@ -252,26 +251,14 @@ memberAccess is
         return false;
     }
 
-    static bool IsSafeProperty(IPropertySymbol propertySymbol)
-    {
+    static bool IsSafeProperty(IPropertySymbol propertySymbol) =>
         // Only primary keys and foreign keys are safe to access
         // because they are always included in EF projections
-
         // Check if it's a primary key (Id, EntityId, etc.)
-        if (IsPrimaryKeyProperty(propertySymbol))
-        {
-            return true;
-        }
-
+        IsPrimaryKeyProperty(propertySymbol) ||
         // Check if it's a foreign key (ParentId, UserId, etc.)
-        if (IsForeignKeyProperty(propertySymbol))
-        {
-            return true;
-        }
-
         // Everything else (navigation properties, scalar properties) is unsafe
-        return false;
-    }
+        IsForeignKeyProperty(propertySymbol);
 
     static bool IsPrimaryKeyProperty(IPropertySymbol propertySymbol)
     {

src/GraphQL.EntityFramework.slnx

@@ -11,7 +11,9 @@
   <Project Path="Benchmarks/Benchmarks.csproj" />
   <Project Path="GraphQL.EntityFramework.Analyzers.Tests/GraphQL.EntityFramework.Analyzers.Tests.csproj" />
   <Project Path="GraphQL.EntityFramework.Analyzers/GraphQL.EntityFramework.Analyzers.csproj" />
-  <Project Path="GraphQL.EntityFramework/GraphQL.EntityFramework.csproj" />
+  <Project Path="GraphQL.EntityFramework/GraphQL.EntityFramework.csproj" >
+    <BuildDependency Project="GraphQL.EntityFramework.Analyzers/GraphQL.EntityFramework.Analyzers.csproj" />
+  </Project>
   <Project Path="SampleWeb.Tests/SampleWeb.Tests.csproj" />
   <Project Path="SampleWeb/SampleWeb.csproj" />
   <Project Path="Snippets/Snippets.csproj" />

src/GraphQL.EntityFramework/GraphQL.EntityFramework.csproj

@@ -30,9 +30,7 @@
     <Using Include="GraphQL.Execution" />
     <Using Include="GraphQL.Builders" />
     <Using Include="System.Text.RegularExpressions" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\GraphQL.EntityFramework.Analyzers\GraphQL.EntityFramework.Analyzers.csproj">
+    <ProjectReference Condition="$(Configuration)=='Release'" Include="..\GraphQL.EntityFramework.Analyzers\GraphQL.EntityFramework.Analyzers.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <OutputItemType>Analyzer</OutputItemType>
     </ProjectReference>