fix diagnostic priorities (dev 15.7) (dotnet#4369)

dsyme · web-flow · commit 7ab095885c76 · 2018-03-21T13:23:42.000Z
* fix diagnostic priorities

* apply versions

* no capturesText in this branch

* fix packages.config
diff --git a/NuGet.Config b/NuGet.Config
@@ -16,7 +16,7 @@
     <add key="myget.org roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="myget.org roslyn tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
-    <add key="myget.org roslyn" value="https://dotnet.myget.org/F/roslyn-for-vs-for-mac/api/v3/index.json" />
+    <add key="myget.org roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
     <add key="myget.org symreader-converter" value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
   </packageSources>
 
diff --git a/RoslynPackageVersion.txt b/RoslynPackageVersion.txt
@@ -1 +1 @@
-2.6.0-vs-for-mac-62329-05
+2.8.0-beta1-62707-12
diff --git a/vsintegration/src/FSharp.Editor/Diagnostics/DocumentDiagnosticAnalyzer.fs b/vsintegration/src/FSharp.Editor/Diagnostics/DocumentDiagnosticAnalyzer.fs
@@ -104,6 +104,8 @@ type internal FSharpDocumentDiagnosticAnalyzer() =
             return results
         }
 
+    override __.Priority = 10 // Default = 50
+
     override this.SupportedDiagnostics = RoslynHelpers.SupportedDiagnostics()
 
     override this.AnalyzeSyntaxAsync(document: Document, cancellationToken: CancellationToken): Task<ImmutableArray<Diagnostic>> =
diff --git a/vsintegration/src/FSharp.Editor/Diagnostics/SimplifyNameDiagnosticAnalyzer.fs b/vsintegration/src/FSharp.Editor/Diagnostics/SimplifyNameDiagnosticAnalyzer.fs
@@ -42,7 +42,7 @@ type internal SimplifyNameDiagnosticAnalyzer() =
             customTags = DiagnosticCustomTags.Unnecessary)
 
     static member LongIdentPropertyKey = "FullName"
-    
+    override __.Priority = 100 // Default = 50
     override __.SupportedDiagnostics = ImmutableArray.Create Descriptor
     override this.AnalyzeSyntaxAsync(_, _) = Task.FromResult ImmutableArray<Diagnostic>.Empty
 
diff --git a/vsintegration/src/FSharp.Editor/Diagnostics/UnusedDeclarationsAnalyzer.fs b/vsintegration/src/FSharp.Editor/Diagnostics/UnusedDeclarationsAnalyzer.fs
@@ -94,6 +94,8 @@ type internal UnusedDeclarationsAnalyzer() =
         //#endif
         unusedRanges
 
+    override __.Priority = 80 // Default = 50
+
     override __.SupportedDiagnostics = ImmutableArray.Create Descriptor
     
     override __.AnalyzeSyntaxAsync(_, _) = Task.FromResult ImmutableArray<Diagnostic>.Empty
diff --git a/vsintegration/src/FSharp.Editor/Diagnostics/UnusedOpensDiagnosticAnalyzer.fs b/vsintegration/src/FSharp.Editor/Diagnostics/UnusedOpensDiagnosticAnalyzer.fs
@@ -35,6 +35,7 @@ type internal UnusedOpensDiagnosticAnalyzer() =
             isEnabledByDefault = true, 
             customTags = DiagnosticCustomTags.Unnecessary)
 
+    override __.Priority = 90 // Default = 50
     override __.SupportedDiagnostics = ImmutableArray.Create Descriptor
     override this.AnalyzeSyntaxAsync(_, _) = Task.FromResult ImmutableArray<Diagnostic>.Empty
 
diff --git a/vsintegration/src/FSharp.Editor/QuickInfo/Views.fs b/vsintegration/src/FSharp.Editor/QuickInfo/Views.fs
@@ -123,6 +123,7 @@ type internal QuickInfoViewProvider
              anonymousTypes = empty, 
              usageText = navigable usage, 
              exceptionText = navigable exceptions)
+             //capturesText = empty)
 
 [<Export (typeof<IDeferredQuickInfoContentToFrameworkElementConverter>)>] 
 type FSharpDeferredContentConverter () =
@@ -131,4 +132,4 @@ type FSharpDeferredContentConverter () =
             let fsharpDeferredContent = deferredContent :?> FSharpQuickInfoDeferredContent
             upcast fsharpDeferredContent.CreateFrameworkElement()
         member this.GetApplicableType () =
-            typeof<FSharpQuickInfoDeferredContent>
+            typeof<FSharpQuickInfoDeferredContent>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2.6.0-vs-for-mac-62329-05`
	`1`	`+2.8.0-beta1-62707-12`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,8 @@ type internal FSharpDocumentDiagnosticAnalyzer() =`
`104`	`104`	`return results`
`105`	`105`	`}`
`106`	`106`
	`107`	`+ override __.Priority = 10 // Default = 50`
	`108`	`+`
`107`	`109`	`override this.SupportedDiagnostics = RoslynHelpers.SupportedDiagnostics()`
`108`	`110`
`109`	`111`	`override this.AnalyzeSyntaxAsync(document: Document, cancellationToken: CancellationToken): Task<ImmutableArray<Diagnostic>> =`