Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.Diagnostics
[TagType(typeof(ClassificationTag))]
internal partial class DiagnosticsClassificationTaggerProvider : AbstractDiagnosticsTaggerProvider<ClassificationTag>
{
private static readonly IEnumerable<Option2<bool>> s_tagSourceOptions = new[] { EditorComponentOnOffOptions.Tagger, InternalFeatureOnOffOptions.Classification, ServiceComponentOnOffOptions.DiagnosticProvider };
private static readonly IEnumerable<Option2<bool>> s_tagSourceOptions = new[] { EditorComponentOnOffOptions.Tagger, InternalFeatureOnOffOptions.Classification };

private readonly ClassificationTypeMap _typeMap;
private readonly ClassificationTag _classificationTag;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.Diagnostics
internal partial class DiagnosticsSquiggleTaggerProvider : AbstractDiagnosticsAdornmentTaggerProvider<IErrorTag>
{
private static readonly IEnumerable<Option2<bool>> s_tagSourceOptions =
ImmutableArray.Create(EditorComponentOnOffOptions.Tagger, InternalFeatureOnOffOptions.Squiggles, ServiceComponentOnOffOptions.DiagnosticProvider);
ImmutableArray.Create(EditorComponentOnOffOptions.Tagger, InternalFeatureOnOffOptions.Squiggles);

protected override IEnumerable<Option2<bool>> Options => s_tagSourceOptions;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ internal partial class DiagnosticsSuggestionTaggerProvider :
AbstractDiagnosticsAdornmentTaggerProvider<IErrorTag>
{
private static readonly IEnumerable<Option2<bool>> s_tagSourceOptions =
ImmutableArray.Create(EditorComponentOnOffOptions.Tagger, InternalFeatureOnOffOptions.Squiggles, ServiceComponentOnOffOptions.DiagnosticProvider);
ImmutableArray.Create(EditorComponentOnOffOptions.Tagger, InternalFeatureOnOffOptions.Squiggles);

protected override IEnumerable<Option2<bool>> Options => s_tagSourceOptions;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,35 +203,6 @@ Namespace Microsoft.CodeAnalysis.Editor.Implementation.Diagnostics.UnitTests
VerifyAllAvailableDiagnostics(test, diagnostics, ordered:=False)
End Sub

<Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
Public Sub TestDiagnosticsFromTurnedOff()
Dim test = <Workspace>
<Project Language="C#" CommonReferences="true">
<Document FilePath="Test.cs">
class Program
{
-
void Test()
{
int a = 5 - "2";
}
}
</Document>
</Project>
<Project Language="Visual Basic" CommonReferences="true">
<Document FilePath="Test.vb">
Class GooClass
Sub Blah() End Sub
End Class
</Document>
</Project>
</Workspace>

Dim diagnostics = <Diagnostics></Diagnostics>

VerifyAllAvailableDiagnostics(test, diagnostics, ordered:=False, enabled:=False)
End Sub

<Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
Public Sub WarningsAsErrors()
Dim test =
Expand Down Expand Up @@ -283,17 +254,9 @@ Namespace Microsoft.CodeAnalysis.Editor.Implementation.Diagnostics.UnitTests
VerifyAllAvailableDiagnostics(test, diagnostics)
End Sub

Private Shared Sub VerifyAllAvailableDiagnostics(test As XElement, diagnostics As XElement, Optional ordered As Boolean = True, Optional enabled As Boolean = True)
Private Shared Sub VerifyAllAvailableDiagnostics(test As XElement, diagnostics As XElement, Optional ordered As Boolean = True)
Using workspace = TestWorkspace.CreateWorkspace(test, composition:=s_composition)

' turn off diagnostic
If Not enabled Then
workspace.TryApplyChanges(workspace.CurrentSolution.WithOptions(workspace.Options _
.WithChangedOption(ServiceComponentOnOffOptions.DiagnosticProvider, False) _
.WithChangedOption(SolutionCrawlerOptions.BackgroundAnalysisScopeOption, LanguageNames.CSharp, BackgroundAnalysisScope.Default) _
.WithChangedOption(SolutionCrawlerOptions.BackgroundAnalysisScopeOption, LanguageNames.VisualBasic, BackgroundAnalysisScope.Default)))
End If

Dim registrationService = workspace.Services.GetService(Of ISolutionCrawlerRegistrationService)()
registrationService.Register(workspace)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,7 @@ public DefaultDiagnosticAnalyzerService(
}

public IIncrementalAnalyzer CreateIncrementalAnalyzer(Workspace workspace)
{
if (!workspace.Options.GetOption(ServiceComponentOnOffOptions.DiagnosticProvider))
{
return null;
}

return new DefaultDiagnosticIncrementalAnalyzer(this, workspace);
}
=> new DefaultDiagnosticIncrementalAnalyzer(this, workspace);

public event EventHandler<DiagnosticsUpdatedArgs> DiagnosticsUpdated;
public event EventHandler DiagnosticsCleared { add { } remove { } }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,7 @@ namespace Microsoft.CodeAnalysis.Diagnostics
internal partial class DiagnosticAnalyzerService : IIncrementalAnalyzerProvider
{
public IIncrementalAnalyzer CreateIncrementalAnalyzer(Workspace workspace)
{
if (!workspace.Options.GetOption(ServiceComponentOnOffOptions.DiagnosticProvider))
{
return null;
}

return _map.GetValue(workspace, _createIncrementalAnalyzer);
}
=> _map.GetValue(workspace, _createIncrementalAnalyzer);

public void ShutdownAnalyzerFrom(Workspace workspace)
{
Expand Down

This file was deleted.

This file was deleted.