(wip): handle language clients that don't support showMessageRequest

dev-cycles · Nov 19, 2023 · 81a206a · 81a206a
1 parent 9c7e8a5
commit 81a206a
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/src/language-server/Contextive.LanguageServer.Tests/SurveyTests.fs b/src/language-server/Contextive.LanguageServer.Tests/SurveyTests.fs
@@ -68,7 +68,7 @@ let tests =
               test <@ msg.IsNone @>
           }
 
-          testAsync "Server creates latch file if user doesn't ignore the prompt" {
+          ftestAsync "Server creates latch file if user doesn't ignore the prompt" {
 
               let messageAwaiter = ConditionAwaiter.create ()
 
@@ -138,4 +138,31 @@ let tests =
               test <@ receivedDoc.External.Value = true @>
               test <@ receivedDoc.Uri.ToString().Contains("forms.gle") @>
 
-          } ]
+          }
+
+          ftestAsync "Server does nothing if client doesn't support showMessageRequest" {
+
+              File.Delete(latchFile)
+
+              let pathValue = Guid.NewGuid().ToString()
+
+              let methodNotFoundHandler =
+                  fun (_: ShowMessageRequestParams) ->
+                      raise (
+                          new OmniSharp.Extensions.JsonRpc.Server.MethodNotSupportedException(
+                              0,
+                              "window/showMessageRequest"
+                          )
+                      )
+
+              let config =
+                  [ showMessageRequestHandlerBuilder <| methodNotFoundHandler
+                    Workspace.optionsBuilder ""
+                    ConfigurationSection.contextivePathBuilder pathValue ]
+
+              let! _ = TestClient(config) |> initAndWaitForReply
+
+              test <@ not <| File.Exists(latchFile) @>
+          }
+
+          ]
diff --git a/src/language-server/Contextive.LanguageServer/Server.fs b/src/language-server/Contextive.LanguageServer/Server.fs
@@ -81,9 +81,6 @@ let private onStartupConfigureServer definitions =
 
             let definitionsFileLoader = pathGetter |> FileLoader.loader
 
-            Serilog.Log.Logger.Information
-                $"ShowDocumentIsSupported: {s.ClientSettings.Capabilities.Window.ShowDocument.IsSupported}"
-
             let showDocument =
                 match s.ClientSettings.Capabilities.Window.ShowDocument.IsSupported with
                 | true -> s.Window.ShowDocument

diff --git a/src/language-server/Contextive.LanguageServer/Survey.fs b/src/language-server/Contextive.LanguageServer/Survey.fs
@@ -28,6 +28,8 @@ let private showSurveyPrompt (s: ILanguageServer) (cancellationToken: Cancellati
                         )
                 )
 
+            //try
+
             let! response = s.Window.ShowMessageRequest(surveyPrompt, cancellationToken)
 
             if response <> null then
@@ -38,10 +40,12 @@ let private showSurveyPrompt (s: ILanguageServer) (cancellationToken: Cancellati
                         s.Window.ShowDocument(ShowDocumentParams(Uri = surveyUri, External = true), cancellationToken)
 
                     ()
+    // with e ->
+    //     Serilog.Log.Logger.Debug("Unable to show survey message {e}", e)
     }
     :> Task
 
 let private nonBlockingShowSurveyPrompt s c = Task.Run(fun _ -> showSurveyPrompt s c)
 
 let public onStartupShowSurveyPrompt =
-    OnLanguageServerStartedDelegate(nonBlockingShowSurveyPrompt)
+    OnLanguageServerStartedDelegate(showSurveyPrompt)