(Preparation for) Multi-root workspace support

src/CSharpLanguageServer/CSharpLanguageServer.fsproj

@@ -33,6 +33,7 @@
     <Compile Include="DocumentationUtil.fs" />
     <Compile Include="Diagnostics.fs" />
     <Compile Include="Lsp/Client.fs" />
+    <Compile Include="Lsp/Workspace.fs" />
     <Compile Include="State/ServerState.fs" />
     <Compile Include="State/ServerRequestContext.fs" />
     <Compile Include="Handlers/CSharpMetadata.fs" />

src/CSharpLanguageServer/Handlers/CSharpMetadata.fs

@@ -5,20 +5,19 @@ open Ionide.LanguageServerProtocol.JsonRpc
 
 open CSharpLanguageServer.Types
 open CSharpLanguageServer.State
+open CSharpLanguageServer.Lsp.Workspace
 
 [<RequireQualifiedAccess>]
 module CSharpMetadata =
     let handle
         (context: ServerRequestContext)
-        (metadataParams: CSharpMetadataParams)
+        (p: CSharpMetadataParams)
         : AsyncLspResult<CSharpMetadataResponse option> =
-        async {
-            let uri = metadataParams.TextDocument.Uri
 
-            let metadataMaybe =
-                context.DecompiledMetadata
-                |> Map.tryFind uri
-                |> Option.map (fun x -> x.Metadata)
-
-            return metadataMaybe |> LspResult.success
-        }
+        p.TextDocument.Uri
+        |> workspaceFolder context.Workspace
+        |> Option.map _.DecompiledMetadata
+        |> Option.bind (Map.tryFind p.TextDocument.Uri)
+        |> Option.map _.Metadata
+        |> LspResult.success
+        |> async.Return

src/CSharpLanguageServer/Handlers/CallHierarchy.fs

@@ -6,7 +6,9 @@ open Ionide.LanguageServerProtocol.Types
 open Ionide.LanguageServerProtocol.JsonRpc
 
 open CSharpLanguageServer.State
+open CSharpLanguageServer.State.ServerState
 open CSharpLanguageServer.Roslyn.Conversions
+open CSharpLanguageServer.Lsp.Workspace
 
 [<RequireQualifiedAccess>]
 module CallHierarchy =
@@ -18,20 +20,27 @@ module CallHierarchy =
               Microsoft.CodeAnalysis.SymbolKind.Event
               Microsoft.CodeAnalysis.SymbolKind.Property ]
 
-    let provider
-        (clientCapabilities: ClientCapabilities)
-        : U3<bool, CallHierarchyOptions, CallHierarchyRegistrationOptions> option =
+    let provider (_cc: ClientCapabilities) : U3<bool, CallHierarchyOptions, CallHierarchyRegistrationOptions> option =
         Some(U3.C1 true)
 
     let prepare
         (context: ServerRequestContext)
         (p: CallHierarchyPrepareParams)
         : AsyncLspResult<CallHierarchyItem[] option> =
         async {
-            match! context.FindSymbol p.TextDocument.Uri p.Position with
-            | Some symbol when isCallableSymbol symbol ->
-                let! itemList = CallHierarchyItem.fromSymbol context.ResolveSymbolLocations symbol
-                return itemList |> List.toArray |> Some |> LspResult.success
+            match! workspaceDocumentSymbol context.Workspace AnyDocument p.TextDocument.Uri p.Position with
+            | Some wf, Some(symbol, project, _) when isCallableSymbol symbol ->
+                let! locations, updatedWf = workspaceFolderSymbolLocations symbol project wf
+
+                context.Emit(WorkspaceFolderChange updatedWf)
+
+                return
+                    locations
+                    |> Seq.map (CallHierarchyItem.fromSymbolAndLocation symbol)
+                    |> Seq.toArray
+                    |> Some
+                    |> LspResult.success
+
             | _ -> return None |> LspResult.success
         }
 
@@ -40,6 +49,8 @@ module CallHierarchy =
         (p: CallHierarchyIncomingCallsParams)
         : AsyncLspResult<CallHierarchyIncomingCall[] option> =
         async {
+            let! ct = Async.CancellationToken
+
             let toCallHierarchyIncomingCalls (info: SymbolCallerInfo) : CallHierarchyIncomingCall seq =
                 let fromRanges =
                     info.Locations
@@ -49,13 +60,15 @@ module CallHierarchy =
                 info.CallingSymbol.Locations
                 |> Seq.choose Location.fromRoslynLocation
                 |> Seq.map (fun loc ->
-                    { From = CallHierarchyItem.fromSymbolAndLocation (info.CallingSymbol) loc
+                    { From = CallHierarchyItem.fromSymbolAndLocation info.CallingSymbol loc
                       FromRanges = fromRanges })
 
-            match! context.FindSymbol p.Item.Uri p.Item.Range.Start with
-            | None -> return None |> LspResult.success
-            | Some symbol ->
-                let! callers = context.FindCallers symbol
+            match! workspaceDocumentSymbol context.Workspace AnyDocument p.Item.Uri p.Item.Range.Start with
+            | Some wf, Some(symbol, _, _) ->
+                let! callers =
+                    SymbolFinder.FindCallersAsync(symbol, wf.Solution.Value, cancellationToken = ct)
+                    |> Async.AwaitTask
+
                 // TODO: If we remove info.IsDirect, then we will get lots of false positive. But if we keep it,
                 // we will miss many callers. Maybe it should have some change in LSP protocol.
                 return
@@ -66,6 +79,8 @@ module CallHierarchy =
                     |> Seq.toArray
                     |> Some
                     |> LspResult.success
+
+            | _, _ -> return None |> LspResult.success
         }
 
     let outgoingCalls

src/CSharpLanguageServer/Handlers/CodeAction.fs

@@ -21,6 +21,7 @@ open CSharpLanguageServer.Logging
 open CSharpLanguageServer.Roslyn.Conversions
 open CSharpLanguageServer.State
 open CSharpLanguageServer.Util
+open CSharpLanguageServer.Lsp.Workspace
 
 
 type CSharpCodeActionResolutionData =
@@ -330,7 +331,10 @@ module CodeAction =
         (p: CodeActionParams)
         : AsyncLspResult<TextDocumentCodeActionResult option> =
         async {
-            match context.GetDocument p.TextDocument.Uri with
+            let wf, docForUri =
+                p.TextDocument.Uri |> workspaceDocument context.Workspace AnyDocument
+
+            match docForUri with
             | None -> return None |> LspResult.success
             | Some doc ->
                 let! ct = Async.CancellationToken
@@ -376,7 +380,7 @@ module CodeAction =
                             let! maybeLspCa =
                                 roslynCodeActionToResolvedLspCodeAction
                                     doc.Project.Solution
-                                    context.GetDocumentVersion
+                                    (Uri.unescape >> workspaceDocumentVersion context.Workspace)
                                     doc
                                     ct
                                     ca
@@ -400,7 +404,11 @@ module CodeAction =
         let resolutionData =
             p.Data |> Option.map deserialize<CSharpCodeActionResolutionData>
 
-        match context.GetDocument resolutionData.Value.TextDocumentUri with
+        let wf, docForUri =
+            resolutionData.Value.TextDocumentUri
+            |> workspaceDocument context.Workspace AnyDocument
+
+        match docForUri with
         | None -> return raise (Exception(sprintf "no document for uri %s" resolutionData.Value.TextDocumentUri))
         | Some doc ->
             let! ct = Async.CancellationToken
@@ -414,7 +422,11 @@ module CodeAction =
                 roslynCodeActions |> Seq.tryFind (fun ca -> ca.Title = p.Title)
 
             let toResolvedLspCodeAction =
-                roslynCodeActionToResolvedLspCodeAction doc.Project.Solution context.GetDocumentVersion doc ct
+                roslynCodeActionToResolvedLspCodeAction
+                    doc.Project.Solution
+                    (Uri.unescape >> workspaceDocumentVersion context.Workspace)
+                    doc
+                    ct
 
             let! lspCodeAction =
                 match selectedCodeAction with

src/CSharpLanguageServer/Handlers/CodeLens.fs

@@ -4,12 +4,14 @@ open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.CSharp
 open Microsoft.CodeAnalysis.CSharp.Syntax
 open Microsoft.CodeAnalysis.Text
+open Microsoft.CodeAnalysis.FindSymbols
 open Ionide.LanguageServerProtocol.Server
 open Ionide.LanguageServerProtocol.Types
 open Ionide.LanguageServerProtocol.JsonRpc
 
 open CSharpLanguageServer.State
 open CSharpLanguageServer.Roslyn.Conversions
+open CSharpLanguageServer.Lsp.Workspace
 
 type private DocumentSymbolCollectorForCodeLens(semanticModel: SemanticModel) =
     inherit CSharpSyntaxWalker(SyntaxWalkerDepth.Token)
@@ -89,9 +91,10 @@ module CodeLens =
               WorkDoneProgress = None }
 
     let handle (context: ServerRequestContext) (p: CodeLensParams) : AsyncLspResult<CodeLens[] option> = async {
-        let docMaybe = context.GetDocument p.TextDocument.Uri
+        let wf, docForUri =
+            p.TextDocument.Uri |> workspaceDocument context.Workspace AnyDocument
 
-        match docMaybe with
+        match docForUri with
         | None -> return None |> LspResult.success
         | Some doc ->
             let! ct = Async.CancellationToken
@@ -120,21 +123,26 @@ module CodeLens =
     }
 
     let resolve (context: ServerRequestContext) (p: CodeLens) : AsyncLspResult<CodeLens> = async {
+        let! ct = Async.CancellationToken
 
         let lensData: CodeLensData =
             p.Data
             |> Option.map _.ToObject<CodeLensData>()
             |> Option.bind Option.ofObj
             |> Option.defaultValue CodeLensData.Default
 
-        match! context.FindSymbol lensData.DocumentUri lensData.Position with
-        | None -> return p |> LspResult.success
-        | Some symbol ->
-            let! locations = context.FindReferences symbol false
+        match! workspaceDocumentSymbol context.Workspace AnyDocument lensData.DocumentUri lensData.Position with
+        | Some wf, Some(symbol, _, _) ->
+            let! refs =
+                SymbolFinder.FindReferencesAsync(symbol, wf.Solution.Value, cancellationToken = ct)
+                |> Async.AwaitTask
+
             // FIXME: refNum is wrong. There are lots of false positive even if we distinct locations by
             // (l.SourceTree.FilePath, l.SourceSpan)
             let refNum =
-                locations
+                refs
+                |> Seq.collect _.Locations
+                |> Seq.map _.Location
                 |> Seq.distinctBy (fun l -> (l.GetMappedLineSpan().Path, l.SourceSpan))
                 |> Seq.length
 
@@ -153,4 +161,6 @@ module CodeLens =
                   Arguments = Some [| arg |> serialize |] }
 
             return { p with Command = Some command } |> LspResult.success
+
+        | _, _ -> return p |> LspResult.success
     }

src/CSharpLanguageServer/Handlers/Completion.fs

@@ -12,6 +12,7 @@ open CSharpLanguageServer.State
 open CSharpLanguageServer.Util
 open CSharpLanguageServer.Roslyn.Conversions
 open CSharpLanguageServer.Logging
+open CSharpLanguageServer.Lsp.Workspace
 
 [<RequireQualifiedAccess>]
 module Completion =
@@ -185,7 +186,10 @@ module Completion =
         (p: CompletionParams)
         : Async<LspResult<U2<CompletionItem array, CompletionList> option>> =
         async {
-            match context.GetDocument p.TextDocument.Uri with
+            let wf, docForUri =
+                p.TextDocument.Uri |> workspaceDocument context.Workspace AnyDocument
+
+            match docForUri with
             | None -> return None |> LspResult.success
             | Some doc ->
                 let! ct = Async.CancellationToken

src/CSharpLanguageServer/Handlers/Definition.fs

@@ -4,6 +4,8 @@ open Ionide.LanguageServerProtocol.Types
 open Ionide.LanguageServerProtocol.JsonRpc
 
 open CSharpLanguageServer.State
+open CSharpLanguageServer.State.ServerState
+open CSharpLanguageServer.Lsp.Workspace
 
 [<RequireQualifiedAccess>]
 module Definition =
@@ -14,9 +16,13 @@ module Definition =
         (p: DefinitionParams)
         : Async<LspResult<U2<Definition, DefinitionLink array> option>> =
         async {
-            match! context.FindSymbol' p.TextDocument.Uri p.Position with
-            | None -> return None |> LspResult.success
-            | Some(symbol, project, _) ->
-                let! locations = context.ResolveSymbolLocations symbol (Some project)
+            match! workspaceDocumentSymbol context.Workspace AnyDocument p.TextDocument.Uri p.Position with
+            | Some wf, Some(symbol, project, _) ->
+                let! locations, updatedWf = workspaceFolderSymbolLocations symbol project wf
+
+                context.Emit(WorkspaceFolderChange updatedWf)
+
                 return locations |> Array.ofList |> Definition.C2 |> U2.C1 |> Some |> LspResult.success
+
+            | _, _ -> return None |> LspResult.success
         }

src/CSharpLanguageServer/Handlers/Diagnostic.fs

@@ -9,6 +9,8 @@ open CSharpLanguageServer.Roslyn.Conversions
 open CSharpLanguageServer.State
 open CSharpLanguageServer.Types
 open CSharpLanguageServer.Util
+open CSharpLanguageServer.Lsp.Workspace
+
 
 [<RequireQualifiedAccess>]
 module Diagnostic =
@@ -36,7 +38,10 @@ module Diagnostic =
                   Items = [||]
                   RelatedDocuments = None }
 
-            match context.GetDocument p.TextDocument.Uri with
+            let wf, docForUri =
+                p.TextDocument.Uri |> workspaceDocument context.Workspace AnyDocument
+
+            match docForUri with
             | None -> return emptyReport |> U2.C1 |> LspResult.success
 
             | Some doc ->
@@ -107,7 +112,7 @@ module Diagnostic =
             let emptyWorkspaceDiagnosticReport: WorkspaceDiagnosticReport =
                 { Items = Array.empty }
 
-            match context.State.Solution, p.PartialResultToken with
+            match context.Workspace.SingletonFolder.Solution, p.PartialResultToken with
             | None, _ -> return emptyWorkspaceDiagnosticReport |> LspResult.success
 
             | Some solution, None ->

src/CSharpLanguageServer/Handlers/DocumentFormatting.fs

@@ -7,9 +7,10 @@ open Ionide.LanguageServerProtocol.JsonRpc
 open CSharpLanguageServer.State
 open CSharpLanguageServer.Util
 open CSharpLanguageServer.Roslyn.Document
+open CSharpLanguageServer.Lsp.Workspace
 
-[<RequireQualifiedAccess>]
 
+[<RequireQualifiedAccess>]
 module DocumentFormatting =
     let provider (_cc: ClientCapabilities) : U2<bool, DocumentFormattingOptions> option = Some(U2.C1 true)
 
@@ -22,12 +23,12 @@ module DocumentFormatting =
     }
 
     let handle (context: ServerRequestContext) (p: DocumentFormattingParams) : AsyncLspResult<TextEdit[] option> =
-        let formatDocument =
-            p.Options
-            |> context.State.Settings.GetEffectiveFormattingOptions
-            |> formatDocument
+        let lspFormattingOptions =
+            p.Options |> context.State.Settings.GetEffectiveFormattingOptions
+
+        let wf, doc = p.TextDocument.Uri |> workspaceDocument context.Workspace UserDocument
 
-        context.GetUserDocument p.TextDocument.Uri
+        doc
         |> async.Return
-        |> Async.bindOption formatDocument
+        |> Async.bindOption (formatDocument lspFormattingOptions)
         |> Async.map LspResult.success

src/CSharpLanguageServer/Handlers/DocumentHighlight.fs

@@ -10,10 +10,11 @@ open Ionide.LanguageServerProtocol.JsonRpc
 open CSharpLanguageServer.State
 open CSharpLanguageServer.Roslyn.Conversions
 open CSharpLanguageServer.Util
+open CSharpLanguageServer.Lsp.Workspace
 
 [<RequireQualifiedAccess>]
 module DocumentHighlight =
-    let provider (_: ClientCapabilities) : U2<bool, DocumentHighlightOptions> option = Some(U2.C1 true)
+    let provider (_cc: ClientCapabilities) : U2<bool, DocumentHighlightOptions> option = Some(U2.C1 true)
 
     let private shouldHighlight (symbol: ISymbol) =
         match symbol with
@@ -56,13 +57,13 @@ module DocumentHighlight =
                           Kind = Some DocumentHighlightKind.Read })
             }
 
-            match! context.FindSymbol' p.TextDocument.Uri p.Position with
-            | Some(symbol, _, Some doc) ->
+            match! workspaceDocumentSymbol context.Workspace AnyDocument p.TextDocument.Uri p.Position with
+            | Some wf, Some(symbol, _, Some doc) ->
                 if shouldHighlight symbol then
                     let! highlights = getHighlights symbol doc
                     return highlights |> Seq.toArray |> Some |> LspResult.success
                 else
                     return None |> LspResult.success
 
-            | _ -> return None |> LspResult.success
+            | _, _ -> return None |> LspResult.success
         }