Context

Author: vasily-kirichenko

src/FSharp.Editing.Messages/Messages.fs

@@ -36,6 +36,7 @@ type ClientNotification =
     | DocumentChanged of FilePath * DocumentContent
       /// Client subscribing on a set of server notifications, passing an address to which them should be sent.
     | Subscribe of Set<ServerCapability> * ClientCallbackAddress
+    | CancelRequest of RequestId
 
 type ClientRequest = 
     { RequestId: RequestId }

src/FSharp.Editing.Server/Context.fs

@@ -0,0 +1,9 @@
+namespace FSharp.Editing.Server
+
+open FSharp.Editing
+
+[<NoComparison>]
+type Context =
+    { Solution: Solution
+      LanguageService: LanguageService }
+

src/FSharp.Editing.Server/FSharp.Editing.Server.fsproj

@@ -59,6 +59,7 @@
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Utilites.fs" />
     <Compile Include="ProjectSystem.fs" />
+    <Compile Include="Context.fs" />
     <Compile Include="MessageRouter.fs" />
     <None Include="paket.references" />
   </ItemGroup>

src/FSharp.Editing.Server/MessageRouter.fs

@@ -5,19 +5,25 @@ open FSharp.Editing.Messages
 module MessageRouter =
     let start() =
         let agent = MailboxProcessor.Start <| fun mb ->
-            let rec loop() =
+            let rec loop ctx =
                 async {
                     let! message = mb.Receive()
-                    match message with
-                    | ClientMessage.Notification _x ->
-                        //dispatchClientNotification x
-                        return! loop()
-                    | ClientMessage.Request _x -> 
-                        //dispatchClientRequest x
-                        return! loop()
+                    match ctx with
+                    | Some ctx ->
+                        match message with
+                        | ClientMessage.Notification _x ->
+                            //match x with
+                            //| ClientNotification.ProjectLoaded project ->
+                              //  return! loop (Some { ctx with Solution = ctx.Solution |> Solution.addOrUpdateProject project })
+                            //dispatchClientNotification x
+                            return! loop (Some ctx)
+                        | ClientMessage.Request _x -> 
+                            //dispatchClientRequest x
+                            return! loop (Some ctx)
+                    | None -> failwith "No solution opened."
 
                 }
-            loop()
+            loop None
 
         agent.Error.Add <| fun e -> Logger.error "%O" e
         agent.Post

src/FSharp.Editing.Server/ProjectSystem.fs

@@ -1,9 +1,19 @@
 namespace FSharp.Editing.Server
 
 open FSharp.Editing
+open Microsoft.FSharp.Compiler.SourceCodeServices
 
+[<NoComparison>]
 type Project =
-    { FilePath: FilePath }
+    { FilePath: FilePath
+      CompilerOptions: FSharpProjectOptions }
 
+[<NoComparison>]
 type Solution =
-    { Projects: Map<FilePath, Project> } 
+    { FileName: FileName option
+      Projects: Map<FilePath, Project> }
+
+//[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+//module Solution =
+    //let addOrUpdateProject project solution =
+        //{ solution with Projects = solution.Projects |> Map.add project }

src/FSharp.Editing.Server/Utilites.fs

@@ -9,3 +9,10 @@ module Logger =
     let debug msg = kprintf (fun x -> Console.WriteLine ((string DateTime.Now) + " [DEBUG] " + x)) msg
     let info msg = kprintf (fun x -> Console.WriteLine ((string DateTime.Now) + " [INFO] " + x)) msg
     let error msg = kprintf (fun x -> Console.WriteLine ((string DateTime.Now) + " [ERROR] " + x)) msg
+
+module Map =
+    let addOrUpdate (key: 'k) (newValue: unit -> 'v) (update: 'v -> 'v) (m: Map<'k, 'v>) =
+        match m |> Map.tryFind key with
+        | Some oldV -> m |> Map.add key (update oldV)
+        | None -> m |> Map.add key (newValue())
+