Skip to content

Commit 7ab0958

Browse files
authored
fix diagnostic priorities (dev 15.7) (#4369)
* fix diagnostic priorities * apply versions * no capturesText in this branch * fix packages.config
1 parent c8a72c2 commit 7ab0958

File tree

7 files changed

+10
-4
lines changed

7 files changed

+10
-4
lines changed

NuGet.Config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<add key="myget.org roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1717
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
1818
<add key="myget.org roslyn tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
19-
<add key="myget.org roslyn" value="https://dotnet.myget.org/F/roslyn-for-vs-for-mac/api/v3/index.json" />
19+
<add key="myget.org roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
2020
<add key="myget.org symreader-converter" value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
2121
</packageSources>
2222

RoslynPackageVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.0-vs-for-mac-62329-05
1+
2.8.0-beta1-62707-12

vsintegration/src/FSharp.Editor/Diagnostics/DocumentDiagnosticAnalyzer.fs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ type internal FSharpDocumentDiagnosticAnalyzer() =
104104
return results
105105
}
106106

107+
override __.Priority = 10 // Default = 50
108+
107109
override this.SupportedDiagnostics = RoslynHelpers.SupportedDiagnostics()
108110

109111
override this.AnalyzeSyntaxAsync(document: Document, cancellationToken: CancellationToken): Task<ImmutableArray<Diagnostic>> =

vsintegration/src/FSharp.Editor/Diagnostics/SimplifyNameDiagnosticAnalyzer.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type internal SimplifyNameDiagnosticAnalyzer() =
4242
customTags = DiagnosticCustomTags.Unnecessary)
4343

4444
static member LongIdentPropertyKey = "FullName"
45-
45+
override __.Priority = 100 // Default = 50
4646
override __.SupportedDiagnostics = ImmutableArray.Create Descriptor
4747
override this.AnalyzeSyntaxAsync(_, _) = Task.FromResult ImmutableArray<Diagnostic>.Empty
4848

vsintegration/src/FSharp.Editor/Diagnostics/UnusedDeclarationsAnalyzer.fs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ type internal UnusedDeclarationsAnalyzer() =
9494
//#endif
9595
unusedRanges
9696

97+
override __.Priority = 80 // Default = 50
98+
9799
override __.SupportedDiagnostics = ImmutableArray.Create Descriptor
98100

99101
override __.AnalyzeSyntaxAsync(_, _) = Task.FromResult ImmutableArray<Diagnostic>.Empty

vsintegration/src/FSharp.Editor/Diagnostics/UnusedOpensDiagnosticAnalyzer.fs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ type internal UnusedOpensDiagnosticAnalyzer() =
3535
isEnabledByDefault = true,
3636
customTags = DiagnosticCustomTags.Unnecessary)
3737

38+
override __.Priority = 90 // Default = 50
3839
override __.SupportedDiagnostics = ImmutableArray.Create Descriptor
3940
override this.AnalyzeSyntaxAsync(_, _) = Task.FromResult ImmutableArray<Diagnostic>.Empty
4041

vsintegration/src/FSharp.Editor/QuickInfo/Views.fs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ type internal QuickInfoViewProvider
123123
anonymousTypes = empty,
124124
usageText = navigable usage,
125125
exceptionText = navigable exceptions)
126+
//capturesText = empty)
126127

127128
[<Export (typeof<IDeferredQuickInfoContentToFrameworkElementConverter>)>]
128129
type FSharpDeferredContentConverter () =
@@ -131,4 +132,4 @@ type FSharpDeferredContentConverter () =
131132
let fsharpDeferredContent = deferredContent :?> FSharpQuickInfoDeferredContent
132133
upcast fsharpDeferredContent.CreateFrameworkElement()
133134
member this.GetApplicableType () =
134-
typeof<FSharpQuickInfoDeferredContent>
135+
typeof<FSharpQuickInfoDeferredContent>

0 commit comments

Comments
 (0)