Merge pull request #62735 from CyrusNajmabadi/removePushDiagnostics

dotnet · Mar 7, 2024 · 3ab3ca7 · 3ab3ca7
2 parents 80ccafa + 0f7211d
commit 3ab3ca7
Show file tree

Hide file tree

Showing 46 changed files with 136 additions and 3,531 deletions.
diff --git a/eng/build.ps1 b/eng/build.ps1
@@ -615,7 +615,7 @@ function Deploy-VsixViaTool() {
   # Configure LSP
   $lspRegistryValue = [int]$lspEditor.ToBool()
   &$vsRegEdit set "$vsDir" $hive HKCU "FeatureFlags\Roslyn\LSP\Editor" Value dword $lspRegistryValue
-  &$vsRegEdit set "$vsDir" $hive HKCU "FeatureFlags\Lsp\PullDiagnostics" Value dword $lspRegistryValue
+  &$vsRegEdit set "$vsDir" $hive HKCU "FeatureFlags\Lsp\PullDiagnostics" Value dword 1
 
   # Disable text editor error reporting because it pops up a dialog. We want to either fail fast in our
   # custom handler or fail silently and continue testing.

diff --git a/src/EditorFeatures/CSharpTest/Squiggles/ErrorSquiggleProducerTests.cs b/src/EditorFeatures/CSharpTest/Squiggles/ErrorSquiggleProducerTests.cs
diff --git a/src/EditorFeatures/CSharpTest/SuggestionTags/SuggestionTagProducerTests.cs b/src/EditorFeatures/CSharpTest/SuggestionTags/SuggestionTagProducerTests.cs
diff --git a/src/EditorFeatures/Core.Wpf/InlineDiagnostics/InlineDiagnosticsTaggerProvider.cs b/src/EditorFeatures/Core.Wpf/InlineDiagnostics/InlineDiagnosticsTaggerProvider.cs
@@ -57,12 +57,6 @@ public InlineDiagnosticsTaggerProvider(
             _classificationTypeRegistryService = classificationTypeRegistryService;
         }
 
-        protected sealed override bool SupportsDiagnosticMode(DiagnosticMode mode)
-        {
-            // We support inline diagnostics in both push and pull (since lsp doesn't support inline diagnostics yet).
-            return true;
-        }
-
         protected sealed override bool IncludeDiagnostic(DiagnosticData diagnostic)
         {
             return

diff --git a/...e/Diagnostics/AbstractDiagnosticsTaggerProvider.SingleDiagnosticKindPullTaggerProvider.cs b/...e/Diagnostics/AbstractDiagnosticsTaggerProvider.SingleDiagnosticKindPullTaggerProvider.cs
@@ -94,10 +94,6 @@ private async Task ProduceTagsAsync(
             if (!_callback.IsEnabled)
                 return;
 
-            var diagnosticMode = GlobalOptions.GetDiagnosticMode();
-            if (!_callback.SupportsDiagnosticMode(diagnosticMode))
-                return;
-
             var document = documentSpanToTag.Document;
             if (document == null)
                 return;

diff --git a/src/EditorFeatures/Core/Diagnostics/AbstractDiagnosticsTaggerProvider.cs b/src/EditorFeatures/Core/Diagnostics/AbstractDiagnosticsTaggerProvider.cs
@@ -65,7 +65,6 @@ SingleDiagnosticKindPullTaggerProvider CreateDiagnosticsTaggerProvider(Diagnosti
 
     protected abstract bool IsEnabled { get; }
 
-    protected abstract bool SupportsDiagnosticMode(DiagnosticMode mode);
     protected abstract bool IncludeDiagnostic(DiagnosticData data);
 
     protected abstract bool TagEquals(TTag tag1, TTag tag2);

diff --git a/src/EditorFeatures/Core/Diagnostics/DiagnosticsClassificationTaggerProvider.cs b/src/EditorFeatures/Core/Diagnostics/DiagnosticsClassificationTaggerProvider.cs
diff --git a/src/EditorFeatures/Core/Diagnostics/DiagnosticsSquiggleTaggerProvider.cs b/src/EditorFeatures/Core/Diagnostics/DiagnosticsSquiggleTaggerProvider.cs