From de25822488517d9d6b7f03a1114d69ca43a95b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Saulius=20Menkevi=C4=8Dius?=
 <sauliusmenkevicius@fastmail.com>
Date: Sun, 29 Sep 2024 17:02:12 +0300
Subject: [PATCH] oh

---
 .../CSharpLanguageServer.Tests.fsproj                      | 2 ++
 tests/CSharpLanguageServer.Tests/ReferenceTests.fs         | 6 +++---
 tests/CSharpLanguageServer.Tests/Tooling.fs                | 7 +++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj b/tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj
index a7f4bac1..49d70498 100644
--- a/tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj
+++ b/tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj
@@ -8,11 +8,13 @@
 
   <ItemGroup>
     <Compile Include="Tooling.fs" />
+    <!--
     <Compile Include="CodeActionTests.fs" />
     <Compile Include="DiagnosticTests.fs" />
     <Compile Include="DocumentationTests.fs" />
     <Compile Include="HoverTests.fs" />
     <Compile Include="InitializationTests.fs" />
+    -->
     <Compile Include="ReferenceTests.fs" />
   </ItemGroup>
 
diff --git a/tests/CSharpLanguageServer.Tests/ReferenceTests.fs b/tests/CSharpLanguageServer.Tests/ReferenceTests.fs
index 97b7472f..ceb161bb 100644
--- a/tests/CSharpLanguageServer.Tests/ReferenceTests.fs
+++ b/tests/CSharpLanguageServer.Tests/ReferenceTests.fs
@@ -45,7 +45,7 @@ let testReferenceWorks() =
 
     let expectedLocations: Location array =
         [|
-            { Uri = classFile.Uri
+            { Uri = classFile.Uri.Substring(7)
               Range = {
                   Start = { Line = 8u; Character = 8u }
                   End = { Line = 8u; Character = 15u }
@@ -122,7 +122,7 @@ public class IndexModel : PageModel
           ("Project/Pages/_ViewImports.cshtml", viewImportsCshtmlContents)
         ]
 
-    use client = setupServerClient defaultClientProfile projectFiles
+    use client = setupServerClient { defaultClientProfile with LoggingEnabled = true } projectFiles
     client.StartAndWaitForSolutionLoad()
 
     use indexCshtmlCsFile = client.Open("Project/Pages/Index.cshtml.cs")
@@ -144,7 +144,7 @@ public class IndexModel : PageModel
 
     let expectedLocations: Location array =
         [|
-            { Uri = indexCshtmlCsContents.Uri
+            { Uri = indexCshtmlCsFile.Uri.Substring(7)
               Range = {
                   Start = { Line = 8u; Character = 8u }
                   End = { Line = 8u; Character = 15u }
diff --git a/tests/CSharpLanguageServer.Tests/Tooling.fs b/tests/CSharpLanguageServer.Tests/Tooling.fs
index db01befd..ba9cdc7e 100644
--- a/tests/CSharpLanguageServer.Tests/Tooling.fs
+++ b/tests/CSharpLanguageServer.Tests/Tooling.fs
@@ -353,6 +353,8 @@ let processClientEvent (state: ClientState) (post: ClientEvent -> unit) msg : As
         let newOutstandingServerRpcReqs =
             state.OutstandingServerRpcReqs |> Map.remove rpcCallId
 
+        logMessage "ServerRpcCallResult" (string result)
+
         match rpcRequest.ResultReplyChannel with
         | Some rc ->
             rc.Reply(result["result"])
@@ -485,7 +487,12 @@ type FileController (client: MailboxProcessor<ClientEvent>, filename: string, ur
 
     member __.Request<'Request, 'Response>(method: string, request: 'Request): 'Response =
         let requestJObject = request |> serialize
+        Console.Error.WriteLine("Request")
         let responseJToken = client.PostAndReply<JToken>(fun rc -> SendServerRpcRequest (method, requestJObject, Some rc))
+        if (responseJToken = null) then
+            Console.Error.WriteLine("Request: responseJToken=null")
+        else
+            Console.Error.WriteLine("Request: responseJToken={0}", responseJToken)
         responseJToken |> deserialize<'Response>
 
     member __.DidChange(text: string) =