fix progress reporter

Author: razzmatazz

src/CSharpLanguageServer/Handlers/CodeLens.fs

@@ -145,7 +145,7 @@ module CodeLens =
 
                 { Range = nameSpan |> Range.fromTextSpan docText.Lines
                   Command = None
-                  Data = lensData |> JToken.FromObject |> Some }
+                  Data = lensData |> serialize |> Some }
 
             let codeLens = collector.GetSymbols() |> Seq.map makeCodeLens
 

src/CSharpLanguageServer/ProgressReporter.fs

@@ -1,17 +1,15 @@
 namespace CSharpLanguageServer
 
-open System
-
-open Newtonsoft.Json.Linq
 open Ionide.LanguageServerProtocol
+open Ionide.LanguageServerProtocol.Server
 open Ionide.LanguageServerProtocol.Types
 
 type ProgressReporter(client: ILspClient) =
     let mutable canReport = false
 
     let mutable endSent = false
 
-    member val Token = ProgressToken.C2 (Guid.NewGuid().ToString())
+    member val Token = ProgressToken.C2 (System.Guid.NewGuid().ToString())
 
     member this.Begin(title, ?cancellable, ?message, ?percentage) = async {
         let! progressCreateResult = client.WindowWorkDoneProgressCreate({ Token = this.Token })
@@ -28,7 +26,7 @@ type ProgressReporter(client: ILspClient) =
                 ?percentage = percentage
             )
 
-            do! client.Progress({ Token = this.Token; Value = JToken.FromObject param })
+            do! client.Progress({ Token = this.Token; Value = serialize param })
     }
 
     member this.Report(?cancellable, ?message, ?percentage) = async {
@@ -38,7 +36,7 @@ type ProgressReporter(client: ILspClient) =
                 ?message = message,
                 ?percentage = percentage
             )
-            do! client.Progress({ Token = this.Token; Value = JToken.FromObject param })
+            do! client.Progress({ Token = this.Token; Value = serialize param })
     }
 
     member this.End(?message) = async {
@@ -47,5 +45,5 @@ type ProgressReporter(client: ILspClient) =
             let param = WorkDoneProgressEnd.Create(
                 ?message = message
             )
-            do! client.Progress({ Token = this.Token; Value = JToken.FromObject param })
+            do! client.Progress({ Token = this.Token; Value = serialize param })
     }