add workspace and diagnostics to lsp (dotnet#7006)

Author: brettfo

Diagnostics/DocumentDiagnosticAnalyzer.fs

@@ -33,7 +33,10 @@ type internal FSharpDocumentDiagnosticAnalyzer [<ImportingConstructor>] () =
 
     let getProjectInfoManager(document: Document) =
         document.Project.Solution.Workspace.Services.GetService<FSharpCheckerWorkspaceService>().FSharpProjectOptionsManager
-    
+
+    let getSettings(document: Document) =
+        document.Project.Solution.Workspace.Services.GetService<EditorOptions>()
+
     static let errorInfoEqualityComparer =
         { new IEqualityComparer<FSharpErrorInfo> with 
             member __.Equals (x, y) =
@@ -110,6 +113,10 @@ type internal FSharpDocumentDiagnosticAnalyzer [<ImportingConstructor>] () =
     interface IFSharpDocumentDiagnosticAnalyzer with
 
         member this.AnalyzeSyntaxAsync(document: Document, cancellationToken: CancellationToken): Task<ImmutableArray<Diagnostic>> =
+            // if using LSP, just bail early
+            let settings = getSettings document
+            if settings.Advanced.UsePreviewDiagnostics then Task.FromResult(ImmutableArray<Diagnostic>.Empty)
+            else
             let projectInfoManager = getProjectInfoManager document
             asyncMaybe {
                 let! parsingOptions, projectOptions = projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document, cancellationToken)
@@ -123,6 +130,10 @@ type internal FSharpDocumentDiagnosticAnalyzer [<ImportingConstructor>] () =
             |> RoslynHelpers.StartAsyncAsTask cancellationToken
 
         member this.AnalyzeSemanticsAsync(document: Document, cancellationToken: CancellationToken): Task<ImmutableArray<Diagnostic>> =
+            // if using LSP, just bail early
+            let settings = getSettings document
+            if settings.Advanced.UsePreviewDiagnostics then Task.FromResult(ImmutableArray<Diagnostic>.Empty)
+            else
             let projectInfoManager = getProjectInfoManager document
             asyncMaybe {
                 let! parsingOptions, _, projectOptions = projectInfoManager.TryGetOptionsForDocumentOrProject(document, cancellationToken) 

LanguageService/FSharpLanguageClient.fs

@@ -34,7 +34,8 @@ type FSharpContentDefinition() =
 type internal FSharpLanguageClient
     [<ImportingConstructor>]
     (
-        lspService: LspService
+        lspService: LspService,
+        settings: EditorOptions
     ) =
     inherit LanguageClient()
     override __.Name = "F# Language Service"
@@ -63,4 +64,7 @@ type internal FSharpLanguageClient
         member __.CustomMessageTarget = null
         member __.MiddleLayer = null
         member __.AttachForCustomMessageAsync(rpc: JsonRpc) =
-            lspService.SetJsonRpc(rpc) |> Async.StartAsTask :> Task
+            async {
+                do! lspService.SetJsonRpc(rpc)
+                do! lspService.SetOptions(settings.Advanced.AsLspOptions())
+            } |> Async.StartAsTask :> Task

Options/EditorOptions.fs

@@ -93,11 +93,16 @@ type CodeLensOptions =
 type AdvancedOptions =
     { IsBlockStructureEnabled: bool
       IsOutliningEnabled: bool
-      UsePreviewTextHover: bool }
+      UsePreviewTextHover: bool
+      UsePreviewDiagnostics: bool }
     static member Default =
       { IsBlockStructureEnabled = true
         IsOutliningEnabled = true
-        UsePreviewTextHover = false }
+        UsePreviewTextHover = false
+        UsePreviewDiagnostics = false }
+    member this.AsLspOptions(): Options =
+        { usePreviewTextHover = this.UsePreviewTextHover
+          usePreviewDiagnostics = this.UsePreviewDiagnostics }
 
 [<CLIMutable>]
 type FormattingOptions =
@@ -203,8 +208,7 @@ module internal OptionsUI =
             async {
                 let lspService = this.GetService<LspService>()
                 let settings = this.GetService<EditorOptions>()
-                let options =
-                    { Options.usePreviewTextHover = settings.Advanced.UsePreviewTextHover }
+                let options = settings.Advanced.AsLspOptions()
                 do! lspService.SetOptions options
             } |> Async.Start