update merlin-lib and test

voodoos · Jun 28, 2024 · f05f575 · f05f575
1 parent 6b22405
commit f05f575
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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": {