Merge pull request #62 from sharwell/update-codeanalysis

Update to Microsoft.CodeAnalysis 1.2.1

Author: sharwell

AsyncUsageAnalyzers/AsyncUsageAnalyzers.CodeFixes/AsyncUsageAnalyzers.CodeFixes.csproj

@@ -34,8 +34,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.0.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="1.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.2.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="1.2.1" />
   </ItemGroup>
 
   <ItemGroup>

AsyncUsageAnalyzers/AsyncUsageAnalyzers.CodeFixes/Helpers/FixAllContextHelper.cs

@@ -8,39 +8,14 @@ namespace AsyncUsageAnalyzers.Helpers
     using System.Collections.Generic;
     using System.Collections.Immutable;
     using System.Linq;
-    using System.Reflection;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis;
     using Microsoft.CodeAnalysis.CodeFixes;
     using Microsoft.CodeAnalysis.Diagnostics;
-    using Microsoft.CodeAnalysis.Text;
 
     internal static class FixAllContextHelper
     {
-        private static readonly ImmutableDictionary<string, ImmutableArray<Type>> DiagnosticAnalyzers = GetAllAnalyzers();
-
-        private static readonly Func<CompilationWithAnalyzers, SyntaxTree, CancellationToken, Task<ImmutableArray<Diagnostic>>> GetAnalyzerSyntaxDiagnosticsAsync;
-        private static readonly Func<CompilationWithAnalyzers, SemanticModel, TextSpan?, CancellationToken, Task<ImmutableArray<Diagnostic>>> GetAnalyzerSemanticDiagnosticsAsync;
-        private static readonly Func<CompilationWithAnalyzers, ImmutableArray<DiagnosticAnalyzer>, CancellationToken, Task<ImmutableArray<Diagnostic>>> GetAnalyzerCompilationDiagnosticsAsync;
-
-        static FixAllContextHelper()
-        {
-            Version roslynVersion = typeof(AdditionalText).GetTypeInfo().Assembly.GetName().Version;
-            bool avoidGetAnalyzerDiagnosticsAsync = roslynVersion >= new Version(1, 1, 0, 0) && roslynVersion < new Version(1, 2, 0, 0);
-            if (avoidGetAnalyzerDiagnosticsAsync)
-            {
-                var methodInfo = typeof(CompilationWithAnalyzers).GetRuntimeMethod(nameof(GetAnalyzerSyntaxDiagnosticsAsync), new[] { typeof(SyntaxTree), typeof(CancellationToken) });
-                GetAnalyzerSyntaxDiagnosticsAsync = (Func<CompilationWithAnalyzers, SyntaxTree, CancellationToken, Task<ImmutableArray<Diagnostic>>>)methodInfo?.CreateDelegate(typeof(Func<CompilationWithAnalyzers, SyntaxTree, CancellationToken, Task<ImmutableArray<Diagnostic>>>));
-
-                methodInfo = typeof(CompilationWithAnalyzers).GetRuntimeMethod(nameof(GetAnalyzerSemanticDiagnosticsAsync), new[] { typeof(SemanticModel), typeof(TextSpan?), typeof(CancellationToken) });
-                GetAnalyzerSemanticDiagnosticsAsync = (Func<CompilationWithAnalyzers, SemanticModel, TextSpan?, CancellationToken, Task<ImmutableArray<Diagnostic>>>)methodInfo?.CreateDelegate(typeof(Func<CompilationWithAnalyzers, SemanticModel, TextSpan?, CancellationToken, Task<ImmutableArray<Diagnostic>>>));
-
-                methodInfo = typeof(CompilationWithAnalyzers).GetRuntimeMethod(nameof(GetAnalyzerCompilationDiagnosticsAsync), new[] { typeof(ImmutableArray<DiagnosticAnalyzer>), typeof(CancellationToken) });
-                GetAnalyzerCompilationDiagnosticsAsync = (Func<CompilationWithAnalyzers, ImmutableArray<DiagnosticAnalyzer>, CancellationToken, Task<ImmutableArray<Diagnostic>>>)methodInfo?.CreateDelegate(typeof(Func<CompilationWithAnalyzers, ImmutableArray<DiagnosticAnalyzer>, CancellationToken, Task<ImmutableArray<Diagnostic>>>));
-            }
-        }
-
         public static async Task<ImmutableDictionary<Document, ImmutableArray<Diagnostic>>> GetDocumentDiagnosticsToFixAsync(FixAllContext fixAllContext)
         {
             var allDiagnostics = ImmutableArray<Diagnostic>.Empty;
@@ -146,87 +121,7 @@ public static async Task<ImmutableDictionary<Project, ImmutableArray<Diagnostic>
 
         public static async Task<ImmutableArray<Diagnostic>> GetAllDiagnosticsAsync(Compilation compilation, CompilationWithAnalyzers compilationWithAnalyzers, ImmutableArray<DiagnosticAnalyzer> analyzers, IEnumerable<Document> documents, bool includeCompilerDiagnostics, CancellationToken cancellationToken)
         {
-            if (GetAnalyzerSyntaxDiagnosticsAsync == null || GetAnalyzerSemanticDiagnosticsAsync == null)
-            {
-                // In everything except Roslyn 1.1, we use GetAllDiagnosticsAsync and return the result.
-                var allDiagnostics = await compilationWithAnalyzers.GetAllDiagnosticsAsync().ConfigureAwait(false);
-                return allDiagnostics;
-            }
-
-            compilationWithAnalyzers.Compilation.GetDeclarationDiagnostics(cancellationToken);
-
-            // Note that the following loop to obtain syntax and semantic diagnostics for each document cannot operate
-            // on parallel due to our use of a single CompilationWithAnalyzers instance.
-            var diagnostics = ImmutableArray.CreateBuilder<Diagnostic>();
-            foreach (var document in documents)
-            {
-                var syntaxTree = await document.GetSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
-                var syntaxDiagnostics = await GetAnalyzerSyntaxDiagnosticsAsync(compilationWithAnalyzers, syntaxTree, cancellationToken).ConfigureAwait(false);
-                diagnostics.AddRange(syntaxDiagnostics);
-
-                var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-                var semanticDiagnostics = await GetAnalyzerSemanticDiagnosticsAsync(compilationWithAnalyzers, semanticModel, default(TextSpan?), cancellationToken).ConfigureAwait(false);
-                diagnostics.AddRange(semanticDiagnostics);
-            }
-
-            foreach (var analyzer in analyzers)
-            {
-                diagnostics.AddRange(await GetAnalyzerCompilationDiagnosticsAsync(compilationWithAnalyzers, ImmutableArray.Create(analyzer), cancellationToken).ConfigureAwait(false));
-            }
-
-            if (includeCompilerDiagnostics)
-            {
-                // This is the special handling for cases where code fixes operate on warnings produced by the C#
-                // compiler, as opposed to being created by specific analyzers.
-                var compilerDiagnostics = compilation.GetDiagnostics(cancellationToken);
-                diagnostics.AddRange(compilerDiagnostics);
-            }
-
-            return diagnostics.ToImmutable();
-        }
-
-        private static ImmutableDictionary<string, ImmutableArray<Type>> GetAllAnalyzers()
-        {
-            Assembly assembly = typeof(NoCodeFixAttribute).GetTypeInfo().Assembly;
-
-            var diagnosticAnalyzerType = typeof(DiagnosticAnalyzer);
-
-            var analyzers = ImmutableDictionary.CreateBuilder<string, ImmutableArray<Type>>();
-
-            foreach (var type in assembly.DefinedTypes)
-            {
-                if (type.IsSubclassOf(diagnosticAnalyzerType) && !type.IsAbstract)
-                {
-                    Type analyzerType = type.AsType();
-                    DiagnosticAnalyzer analyzer = (DiagnosticAnalyzer)Activator.CreateInstance(analyzerType);
-                    foreach (var descriptor in analyzer.SupportedDiagnostics)
-                    {
-                        ImmutableArray<Type> types;
-                        if (analyzers.TryGetValue(descriptor.Id, out types))
-                        {
-                            types = types.Add(analyzerType);
-                        }
-                        else
-                        {
-                            types = ImmutableArray.Create(analyzerType);
-                        }
-
-                        analyzers[descriptor.Id] = types;
-                    }
-                }
-            }
-
-            return analyzers.ToImmutable();
-        }
-
-        private static ImmutableArray<DiagnosticAnalyzer> GetDiagnosticAnalyzersForContext(FixAllContext fixAllContext)
-        {
-            return DiagnosticAnalyzers
-                .Where(x => fixAllContext.DiagnosticIds.Contains(x.Key))
-                .SelectMany(x => x.Value)
-                .Distinct()
-                .Select(type => (DiagnosticAnalyzer)Activator.CreateInstance(type))
-                .ToImmutableArray();
+            return await compilationWithAnalyzers.GetAllDiagnosticsAsync(cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -239,32 +134,7 @@ private static ImmutableArray<DiagnosticAnalyzer> GetDiagnosticAnalyzersForConte
         /// successfully, the <see cref="Task{TResult}.Result"/> will contain the requested diagnostics.</returns>
         private static async Task<ImmutableArray<Diagnostic>> GetAllDiagnosticsAsync(FixAllContext fixAllContext, Project project)
         {
-            if (GetAnalyzerSyntaxDiagnosticsAsync == null || GetAnalyzerSemanticDiagnosticsAsync == null)
-            {
-                return await fixAllContext.GetAllDiagnosticsAsync(project).ConfigureAwait(false);
-            }
-
-            /*
-             * The rest of this method is workaround code for issues with Roslyn 1.1...
-             */
-
-            var analyzers = GetDiagnosticAnalyzersForContext(fixAllContext);
-
-            // Most code fixes in this project operate on diagnostics reported by analyzers in this project. However, a
-            // few code fixes also operate on standard warnings produced by the C# compiler. Special handling is
-            // required for the latter case since these warnings are not considered "analyzer diagnostics".
-            bool includeCompilerDiagnostics = fixAllContext.DiagnosticIds.Any(x => x.StartsWith("CS", StringComparison.Ordinal));
-
-            // Use a single CompilationWithAnalyzers for the entire operation. This allows us to use the
-            // GetDeclarationDiagnostics workaround for dotnet/roslyn#7446 a single time, rather than once per document.
-            var compilation = await project.GetCompilationAsync(fixAllContext.CancellationToken).ConfigureAwait(false);
-            var compilationWithAnalyzers = compilation.WithAnalyzers(analyzers, project.AnalyzerOptions, fixAllContext.CancellationToken);
-            ImmutableArray<Diagnostic> diagnostics = await GetAllDiagnosticsAsync(compilation, compilationWithAnalyzers, analyzers, project.Documents, includeCompilerDiagnostics, fixAllContext.CancellationToken).ConfigureAwait(false);
-
-            // Make sure to filter the results to the set requested for the Fix All operation, since analyzers can
-            // report diagnostics with different IDs.
-            diagnostics = diagnostics.RemoveAll(x => !fixAllContext.DiagnosticIds.Contains(x.Id));
-            return diagnostics;
+            return await fixAllContext.GetAllDiagnosticsAsync(project).ConfigureAwait(false);
         }
 
         private static async Task<ImmutableDictionary<Document, ImmutableArray<Diagnostic>>> GetDocumentDiagnosticsToFixAsync(

AsyncUsageAnalyzers/AsyncUsageAnalyzers.Test/AsyncUsageAnalyzers.Test.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="1.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="1.2.1" />
     <PackageReference Include="xunit" Version="2.3.0-beta3-build3705" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta3-build3705" PrivateAssets="all" />
   </ItemGroup>

AsyncUsageAnalyzers/AsyncUsageAnalyzers.ruleset

@@ -70,9 +70,6 @@
     <Rule Id="CA2241" Action="Warning" />
     <Rule Id="CA2242" Action="Warning" />
   </Rules>
-  <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp" RuleNamespace="Microsoft.CodeAnalysis.CSharp">
-    <Rule Id="AD0001" Action="None" />
-  </Rules>
   <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.Features" RuleNamespace="Microsoft.CodeAnalysis.CSharp.Features">
     <Rule Id="IDE0003" Action="None" />
   </Rules>