Merge branch 'master' of github.com:yatli/coc-fsharp

client/extension.ts

@@ -21,6 +21,8 @@ export function activate(context: ExtensionContext) {
 		args: [], 
 		transport: TransportKind.stdio
 	}
+
+    workspace.addRootPatterns('fsharp', ['*.fsproj', '*.fsx', 'projects.assets.json', '.vim', '.git', '.hg'])
 
 	// Options to control the language client
 	let clientOptions: LanguageClientOptions = {

package.json

@@ -5,7 +5,7 @@
     "author": "Yatao Li",
     "license": "MIT",
     "icon": "Icon512.png",
-    "version": "0.1.32",
+    "version": "0.1.33",
     "publisher": "yatli",
     "repository": {
         "type": "git",

src/FSharpLanguageServer/Program.fs

@@ -844,13 +844,18 @@ type Server(client: ILanguageClient) =
             }
         member this.ExecuteCommand(p: ExecuteCommandParams): Async<unit> = TODO()
         member this.DidChangeWorkspaceFolders(p: DidChangeWorkspaceFoldersParams): Async<unit> = 
+            let __doworkspace (xs: WorkspaceFolder list) fn = 
+                async {
+                    for root in xs do 
+                        let file = FileInfo(root.uri.LocalPath)
+                        do! fn file.Directory
+                }
             async {
-                for root in p.event.added do 
-                    let file = FileInfo(root.uri.LocalPath)
-                    do! projects.AddWorkspaceRoot(file.Directory)
-                // TODO removed
+                do! __doworkspace p.event.added projects.AddWorkspaceRoot
+                do! __doworkspace p.event.removed projects.RemoveWorkspaceRoot
             }
 
+
 [<EntryPoint>]
 let main(argv: array<string>): int =
     let read = new BinaryReader(Console.OpenStandardInput())

src/FSharpLanguageServer/ProjectManager.fs

@@ -380,6 +380,17 @@ type ProjectManager(checker: FSharpChecker) as this =
                 else if f.Name.EndsWith(".sln") then
                     knownSolutions.[f.FullName] <- slnProjectReferences(f)
         }
+    member this.RemoveWorkspaceRoot(root: DirectoryInfo): Async<unit> =         
+        async {
+            for f in root.EnumerateFiles("*.*", SearchOption.AllDirectories) do 
+                knownProjects.Remove(f.FullName) |> ignore
+                knownSolutions.Remove(f.FullName) |> ignore
+        }
+    member this.ClearWorkspaceRoot(): Async<unit> = 
+        async {
+            knownProjects.Clear()
+            knownSolutions.Clear()
+        }
     member this.DeleteProjectFile(fsprojOrFsx: FileInfo) = 
         knownProjects.Remove(fsprojOrFsx.FullName) |> ignore
         cache.Invalidate(fsprojOrFsx) |> ignore