Reapply "Remove the ProjectDiagnosticAnalyzer type (#77899)" (#77969) (#77970)

This reverts commit b5d7ffb, reversing
changes made to 4ff7d42.

This can go in now that TS has merged into d18initial:
https://devdiv.visualstudio.com/DevDiv/_git/VS?path=/.corext/Configs/components.json&version=GBmain&line=465&lineEnd=469&lineStartColumn=1&lineEndColumn=7&lineStyle=plain&_a=contents

Author: CyrusNajmabadi

src/EditorFeatures/Test/Diagnostics/DiagnosticAnalyzerServiceTests.cs

@@ -239,7 +239,7 @@ public async Task TestHostAnalyzerErrorNotLeaking()
 
         var solution = workspace.CurrentSolution;
 
-        var analyzerReference = new AnalyzerImageReference([new LeakDocumentAnalyzer(), new LeakProjectAnalyzer()]);
+        var analyzerReference = new AnalyzerImageReference([new LeakDocumentAnalyzer()]);
 
         var globalOptions = GetGlobalOptions(workspace);
         globalOptions.SetGlobalOption(SolutionCrawlerOptionsStorage.BackgroundAnalysisScopeOption, LanguageNames.CSharp, BackgroundAnalysisScope.FullSolution);
@@ -913,13 +913,6 @@ public override Task<ImmutableArray<Diagnostic>> AnalyzeSemanticsAsync(Document
             => SpecializedTasks.Default<ImmutableArray<Diagnostic>>();
     }
 
-    private sealed class LeakProjectAnalyzer : ProjectDiagnosticAnalyzer
-    {
-        private static readonly DiagnosticDescriptor s_rule = new DiagnosticDescriptor("project", "test", "test", "test", DiagnosticSeverity.Error, isEnabledByDefault: true);
-        public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => [s_rule];
-        public override Task<ImmutableArray<Diagnostic>> AnalyzeProjectAsync(Project project, CancellationToken cancellationToken) => SpecializedTasks.Default<ImmutableArray<Diagnostic>>();
-    }
-
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
     private sealed class NamedTypeAnalyzer : DiagnosticAnalyzer
     {

src/Features/Core/Portable/Diagnostics/DiagnosticAnalyzerExtensions.cs

@@ -14,8 +14,7 @@ namespace Microsoft.CodeAnalysis.Diagnostics;
 internal static class DiagnosticAnalyzerExtensions
 {
     public static bool IsWorkspaceDiagnosticAnalyzer(this DiagnosticAnalyzer analyzer)
-        => analyzer is DocumentDiagnosticAnalyzer
-        || analyzer is ProjectDiagnosticAnalyzer;
+        => analyzer is DocumentDiagnosticAnalyzer;
 
     public static bool IsBuiltInAnalyzer(this DiagnosticAnalyzer analyzer)
         => analyzer is IBuiltInAnalyzer || analyzer.IsWorkspaceDiagnosticAnalyzer() || analyzer.IsCompilerAnalyzer();

src/Features/Core/Portable/ExternalAccess/VSTypeScript/Api/IVSTypeScriptDiagnosticAnalyzerImplementation.cs

@@ -119,39 +119,6 @@ public static async Task<ImmutableArray<Diagnostic>> ComputeDocumentDiagnosticAn
         return diagnostics;
     }
 
-    public static async Task<ImmutableArray<Diagnostic>> ComputeProjectDiagnosticAnalyzerDiagnosticsAsync(
-        ProjectDiagnosticAnalyzer analyzer,
-        Project project,
-        Compilation? compilation,
-        CancellationToken cancellationToken)
-    {
-        cancellationToken.ThrowIfCancellationRequested();
-
-        ImmutableArray<Diagnostic> diagnostics;
-        try
-        {
-            diagnostics = (await analyzer.AnalyzeProjectAsync(project, cancellationToken).ConfigureAwait(false)).NullToEmpty();
-#if DEBUG
-            // since all ProjectDiagnosticAnalyzers are from internal users, we only do debug check. also this can be expensive at runtime
-            // since it requires await. if we find any offender through NFW, we should be able to fix those since all those should
-            // from intern teams.
-            await VerifyDiagnosticLocationsAsync(diagnostics, project, cancellationToken).ConfigureAwait(false);
-#endif
-        }
-        catch (Exception e) when (!IsCanceled(e, cancellationToken))
-        {
-            diagnostics = [CreateAnalyzerExceptionDiagnostic(analyzer, e)];
-        }
-
-        // Apply filtering from compilation options (source suppressions, ruleset, etc.)
-        if (compilation != null)
-        {
-            diagnostics = CompilationWithAnalyzers.GetEffectiveDiagnostics(diagnostics, compilation).ToImmutableArrayOrEmpty();
-        }
-
-        return diagnostics;
-    }
-
     private static bool IsCanceled(Exception ex, CancellationToken cancellationToken)
         => (ex as OperationCanceledException)?.CancellationToken == cancellationToken;
 

src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerLanguageService.cs

@@ -28,14 +28,14 @@ private sealed partial class DiagnosticIncrementalAnalyzer
         private async Task<ImmutableDictionary<DiagnosticAnalyzer, DiagnosticAnalysisResult>> ComputeDiagnosticAnalysisResultsAsync(
             CompilationWithAnalyzersPair? compilationWithAnalyzers,
             Project project,
-            ImmutableArray<DiagnosticAnalyzer> analyzers,
+            ImmutableArray<DocumentDiagnosticAnalyzer> analyzers,
             CancellationToken cancellationToken)
         {
             using (Logger.LogBlock(FunctionId.Diagnostics_ProjectDiagnostic, GetProjectLogMessage, project, analyzers, cancellationToken))
             {
                 try
                 {
-                    var result = await ComputeDiagnosticsForIDEAnalyzersAsync(analyzers).ConfigureAwait(false);
+                    var result = await ComputeDiagnosticsForAnalyzersAsync(analyzers).ConfigureAwait(false);
 
                     // If project is not loaded successfully, get rid of any semantic errors from compiler analyzer.
                     // Note: In the past when project was not loaded successfully we did not run any analyzers on the project.
@@ -86,7 +86,7 @@ async Task<ImmutableDictionary<DiagnosticAnalyzer, DiagnosticAnalysisResult>> Re
             // Calculate all diagnostics for a given project using analyzers referenced by the project and specified IDE analyzers.
             // </summary>
             async Task<ImmutableDictionary<DiagnosticAnalyzer, DiagnosticAnalysisResult>> ComputeDiagnosticsForAnalyzersAsync(
-                ImmutableArray<DiagnosticAnalyzer> ideAnalyzers)
+                ImmutableArray<DocumentDiagnosticAnalyzer> ideAnalyzers)
             {
                 try
                 {
@@ -107,7 +107,6 @@ async Task<ImmutableDictionary<DiagnosticAnalyzer, DiagnosticAnalysisResult>> Co
                     }
 
                     // check whether there is IDE specific project diagnostic analyzer
-                    Debug.Assert(ideAnalyzers.All(a => a is ProjectDiagnosticAnalyzer or DocumentDiagnosticAnalyzer));
                     return await MergeProjectDiagnosticAnalyzerDiagnosticsAsync(ideAnalyzers, result).ConfigureAwait(false);
                 }
                 catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e, cancellationToken))
@@ -116,67 +115,42 @@ async Task<ImmutableDictionary<DiagnosticAnalyzer, DiagnosticAnalysisResult>> Co
                 }
             }
 
-            async Task<ImmutableDictionary<DiagnosticAnalyzer, DiagnosticAnalysisResult>> ComputeDiagnosticsForIDEAnalyzersAsync(
-                ImmutableArray<DiagnosticAnalyzer> analyzers)
-            {
-                try
-                {
-                    var ideAnalyzers = analyzers.WhereAsArray(a => a is ProjectDiagnosticAnalyzer or DocumentDiagnosticAnalyzer);
-
-                    return await ComputeDiagnosticsForAnalyzersAsync(ideAnalyzers).ConfigureAwait(false);
-                }
-                catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e, cancellationToken))
-                {
-                    throw ExceptionUtilities.Unreachable();
-                }
-            }
-
             async Task<ImmutableDictionary<DiagnosticAnalyzer, DiagnosticAnalysisResult>> MergeProjectDiagnosticAnalyzerDiagnosticsAsync(
-                ImmutableArray<DiagnosticAnalyzer> ideAnalyzers,
+                ImmutableArray<DocumentDiagnosticAnalyzer> ideAnalyzers,
                 ImmutableDictionary<DiagnosticAnalyzer, DiagnosticAnalysisResult> result)
             {
                 try
                 {
                     var compilation = compilationWithAnalyzers?.HostCompilation;
 
-                    foreach (var analyzer in ideAnalyzers)
+                    foreach (var documentAnalyzer in ideAnalyzers)
                     {
                         var builder = new DiagnosticAnalysisResultBuilder(project);
 
-                        switch (analyzer)
+                        foreach (var textDocument in project.AdditionalDocuments.Concat(project.Documents))
                         {
-                            case DocumentDiagnosticAnalyzer documentAnalyzer:
-                                foreach (var textDocument in project.AdditionalDocuments.Concat(project.Documents))
-                                {
-                                    var tree = textDocument is Document document
-                                        ? await document.GetSyntaxTreeAsync(cancellationToken).ConfigureAwait(false)
-                                        : null;
-                                    var syntaxDiagnostics = await DocumentAnalysisExecutor.ComputeDocumentDiagnosticAnalyzerDiagnosticsAsync(documentAnalyzer, textDocument, AnalysisKind.Syntax, compilation, tree, cancellationToken).ConfigureAwait(false);
-                                    var semanticDiagnostics = await DocumentAnalysisExecutor.ComputeDocumentDiagnosticAnalyzerDiagnosticsAsync(documentAnalyzer, textDocument, AnalysisKind.Semantic, compilation, tree, cancellationToken).ConfigureAwait(false);
-
-                                    if (tree != null)
-                                    {
-                                        builder.AddSyntaxDiagnostics(tree, syntaxDiagnostics);
-                                        builder.AddSemanticDiagnostics(tree, semanticDiagnostics);
-                                    }
-                                    else
-                                    {
-                                        builder.AddExternalSyntaxDiagnostics(textDocument.Id, syntaxDiagnostics);
-                                        builder.AddExternalSemanticDiagnostics(textDocument.Id, semanticDiagnostics);
-                                    }
-                                }
-
-                                break;
-
-                            case ProjectDiagnosticAnalyzer projectAnalyzer:
-                                builder.AddCompilationDiagnostics(await DocumentAnalysisExecutor.ComputeProjectDiagnosticAnalyzerDiagnosticsAsync(projectAnalyzer, project, compilation, cancellationToken).ConfigureAwait(false));
-                                break;
+                            var tree = textDocument is Document document
+                                ? await document.GetSyntaxTreeAsync(cancellationToken).ConfigureAwait(false)
+                                : null;
+                            var syntaxDiagnostics = await DocumentAnalysisExecutor.ComputeDocumentDiagnosticAnalyzerDiagnosticsAsync(documentAnalyzer, textDocument, AnalysisKind.Syntax, compilation, tree, cancellationToken).ConfigureAwait(false);
+                            var semanticDiagnostics = await DocumentAnalysisExecutor.ComputeDocumentDiagnosticAnalyzerDiagnosticsAsync(documentAnalyzer, textDocument, AnalysisKind.Semantic, compilation, tree, cancellationToken).ConfigureAwait(false);
+
+                            if (tree != null)
+                            {
+                                builder.AddSyntaxDiagnostics(tree, syntaxDiagnostics);
+                                builder.AddSemanticDiagnostics(tree, semanticDiagnostics);
+                            }
+                            else
+                            {
+                                builder.AddExternalSyntaxDiagnostics(textDocument.Id, syntaxDiagnostics);
+                                builder.AddExternalSemanticDiagnostics(textDocument.Id, semanticDiagnostics);
+                            }
                         }
 
                         // merge the result to existing one.
                         // there can be existing one from compiler driver with empty set. overwrite it with
                         // ide one.
-                        result = result.SetItem(analyzer, DiagnosticAnalysisResult.CreateFromBuilder(builder));
+                        result = result.SetItem(documentAnalyzer, DiagnosticAnalysisResult.CreateFromBuilder(builder));
                     }
 
                     return result;

src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDocumentDiagnosticAnalyzer.cs

@@ -144,7 +144,6 @@ private static int GetPriority(DiagnosticAnalyzer state)
             return state switch
             {
                 DocumentDiagnosticAnalyzer analyzer => analyzer.Priority,
-                ProjectDiagnosticAnalyzer analyzer => Math.Max(0, analyzer.Priority),
                 _ => RegularDiagnosticAnalyzerPriority,
             };
         }

src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptProjectDiagnosticAnalyzer.cs

@@ -48,7 +48,7 @@ public DiagnosticIncrementalAnalyzer(
         public Task<ImmutableArray<DiagnosticAnalyzer>> GetAnalyzersForTestingPurposesOnlyAsync(Project project, CancellationToken cancellationToken)
             => _stateManager.GetOrCreateAnalyzersAsync(project.Solution.SolutionState, project.State, cancellationToken);
 
-        private static string GetProjectLogMessage(Project project, ImmutableArray<DiagnosticAnalyzer> analyzers)
+        private static string GetProjectLogMessage(Project project, ImmutableArray<DocumentDiagnosticAnalyzer> analyzers)
             => $"project: ({project.Id}), ({string.Join(Environment.NewLine, analyzers.Select(a => a.ToString()))})";
     }
 }