Merge pull request #138 from leancodepl/fix-analyzer-thread-safety

Fix analyzer thread safety and stray nullability warning
leancodepl · Jun 20, 2023 · 2081a09 · 2081a09
2 parents b0bda21 + 057bd0e
commit 2081a09
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/LeanCode.ContractsGenerator/AnalyzeFailedException.cs b/src/LeanCode.ContractsGenerator/AnalyzeFailedException.cs
@@ -5,7 +5,7 @@ public class AnalyzeFailedException : Exception
     public IReadOnlyList<AnalyzeError> Errors { get; }
 
     public AnalyzeFailedException(IReadOnlyList<AnalyzeError> errors)
-        : base("Analyze phase failed.")
+        : base(string.Join('\n', errors.Select(e => e.ToString()).Prepend("Analyze phase failed.")))
     {
         Errors = errors;
     }

diff --git a/src/LeanCode.ContractsGenerator/Analyzers/AllAnalyzers.cs b/src/LeanCode.ContractsGenerator/Analyzers/AllAnalyzers.cs
@@ -2,7 +2,7 @@ namespace LeanCode.ContractsGenerator.Analyzers;
 
 public class AllAnalyzers : IAnalyzer
 {
-    private static readonly IReadOnlyList<IAnalyzer> Analyzers = new IAnalyzer[]
+    private readonly IReadOnlyList<IAnalyzer> analyzers = new IAnalyzer[]
     {
         new InternalStructureCheck(),
         new KnownTypeCheck(),
@@ -13,6 +13,6 @@ public class AllAnalyzers : IAnalyzer
 
     public IEnumerable<AnalyzeError> Analyze(Export export)
     {
-        return Analyzers.SelectMany(a => a.Analyze(export));
+        return analyzers.SelectMany(a => a.Analyze(export));
     }
 }
diff --git a/src/LeanCode.ContractsGenerator/Compilation/ProjectLoader.cs b/src/LeanCode.ContractsGenerator/Compilation/ProjectLoader.cs
@@ -30,8 +30,10 @@ await Console.Error.WriteLineAsync(
         foreach (var projectPath in projectPathsList)
         {
             if (msbuildWorkspace.CurrentSolution.Projects
-                .Where(p => p.FilePath is not null)
-                .Any(p => ResolveCanonicalPath(p.FilePath) == projectPath))
+                .Select(p => p.FilePath)
+                .OfType<string>()
+                .Select(ResolveCanonicalPath)
+                .Contains(projectPath))
             {
                 continue;
             }

diff --git a/src/LeanCode.ContractsGenerator/IAnalyzer.cs b/src/LeanCode.ContractsGenerator/IAnalyzer.cs
@@ -5,4 +5,7 @@ public interface IAnalyzer
     IEnumerable<AnalyzeError> Analyze(Export export);
 }
 
-public record AnalyzeError(string Code, string Message, AnalyzerContext Context);
+public record AnalyzeError(string Code, string Message, AnalyzerContext Context)
+{
+    public override string ToString() => $"{Code}: {Message}\n  at {Context.Path}";
+}