wip: get desync info from merlin

voodoos · Jan 29, 2024 · ef50a83 · ef50a83
1 parent 5265d22
commit ef50a83
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ocaml-lsp-server/src/ocaml_lsp_server.ml b/ocaml-lsp-server/src/ocaml_lsp_server.ml
@@ -433,7 +433,7 @@ let references (state : State.t)
   match Document.kind doc with
   | `Other -> Fiber.return None
   | `Merlin doc ->
-    let+ locs =
+    let+ locs, _desync =
       Document.Merlin.dispatch_exn
         doc
         (Occurrences (`Ident_at (Position.logical position), `Project))
@@ -461,7 +461,7 @@ let highlight (state : State.t)
   match Document.kind doc with
   | `Other -> Fiber.return None
   | `Merlin m ->
-    let+ locs =
+    let+ locs, _desync =
       Document.Merlin.dispatch_exn
         m
         (Occurrences (`Ident_at (Position.logical position), `Buffer))
@@ -637,7 +637,7 @@ let on_request :
         match Document.kind doc with
         | `Other -> Fiber.return None
         | `Merlin doc ->
-          let+ locs =
+          let+ locs, _desync =
             Document.Merlin.dispatch_exn
               doc
               (Occurrences (`Ident_at (Position.logical position), `Buffer))

diff --git a/ocaml-lsp-server/src/rename.ml b/ocaml-lsp-server/src/rename.ml
@@ -10,7 +10,7 @@ let rename (state : State.t)
     let command =
       Query_protocol.Occurrences (`Ident_at (Position.logical position), `Buffer)
     in
-    let+ locs = Document.Merlin.dispatch_exn merlin command in
+    let+ locs, _desync = Document.Merlin.dispatch_exn merlin command in
     let version = Document.version doc in
     let source = Document.source doc in
     let edits =