From f05f57522f63e4cb8821ce10ac47c2bbdb074669 Mon Sep 17 00:00:00 2001
From: PizieDust <playersrebirth@gmail.com>
Date: Fri, 28 Jun 2024 17:50:57 +0100
Subject: [PATCH] update merlin-lib and test

---
 ocaml-lsp-server/src/hover_req.ml         | 1 -
 ocaml-lsp-server/test/e2e-new/with_ppx.ml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ocaml-lsp-server/src/hover_req.ml b/ocaml-lsp-server/src/hover_req.ml
index 8ff52bbcc..d2c9163d7 100644
--- a/ocaml-lsp-server/src/hover_req.ml
+++ b/ocaml-lsp-server/src/hover_req.ml
@@ -470,7 +470,6 @@ let handle server { HoverParams.textDocument = { uri }; position; _ } mode =
               (Document.merlin_exn doc)
               (fun pipeline -> Mpipeline.ppx_parsetree pipeline)
           in
-
           let ppx_source =
             Merlin_analysis.Ppx_expand.get_ppxed_source
               ~ppxed_parsetree
diff --git a/ocaml-lsp-server/test/e2e-new/with_ppx.ml b/ocaml-lsp-server/test/e2e-new/with_ppx.ml
index 11b984ce2..a9198edb6 100644
--- a/ocaml-lsp-server/test/e2e-new/with_ppx.ml
+++ b/ocaml-lsp-server/test/e2e-new/with_ppx.ml
@@ -74,7 +74,7 @@ let%expect_test "with-ppx" =
       Received 0 diagnostics
       {
         "contents": {
-          "value": "(* ppx expect expansion *)\n((({\n     tag = (Some \"\");\n     body = (Pretty \"\");\n     extid_location =\n       ((({\n            filename = (Expect_test_common.File.Name.of_string \"for_ppx.ml\");\n            line_number = 3;\n            line_start = 110;\n            start_pos = 114;\n            end_pos = 120\n          } : Expect_test_common.File.Location.t))[@merlin.hide ]);\n     body_location =\n       ((({\n            filename = (Expect_test_common.File.Name.of_string \"for_ppx.ml\");\n            line_number = 3;\n            line_start = 110;\n            start_pos = 121;\n            end_pos = 125\n          } : Expect_test_common.File.Location.t))[@merlin.hide ])\n   } : string Expect_test_common.Expectation.t))\n[@merlin.hide ])Expect_test_collector.save_output\n                  ((({\n                       filename =\n                         (Expect_test_common.File.Name.of_string \"for_ppx.ml\");\n                       line_number = 3;\n                       line_start = 110;\n                       start_pos = 114;\n                       end_pos = 120\n                     } : Expect_test_common.File.Location.t))[@merlin.hide ])\nPpx_inline_test_lib.unset_lib \"ocaml_lsp_e2e\"Expect_test_collector.Current_file.unset\n                                               ()",
+          "value": "(* ppx expect expansion *)\nExpect_test_collector.Current_file.unset ()",
           "language": "ocaml"
         },
         "range": {