Merge branch 'master' of github.com:/ocaml/ocaml-lsp into Add-ocamlformat-mlx

* 'master' of github.com:/ocaml/ocaml-lsp:
  Rename parameter used to configure nested bindings. (#1568)
  Upgrade to ocamlformat 0.28.1 (#1569)
  Improve precision of duration field in `view-metrics` (#1565)
  Make `code-lens` for toplevel let binding configurable (#1567)
  Fix 5.4 CI
  Enable support for OCaml 5.4 and prepare release 1.24.0 (#1559)
  Prepare release 1.23.1 (#1558)

Author: davesnx

.github/workflows/build-and-test.yml

@@ -45,11 +45,11 @@ jobs:
       - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: "ocaml-base-compiler.5.3.0"
+          ocaml-compiler: "5.4"
 
       # Remove this pin once a compatible version of Merlin has been released
       - name: Pin dev Merlin
-        run: opam --cli=2.1 pin --with-version=5.5-503 https://github.com/ocaml/merlin.git#main
+        run: opam --cli=2.1 pin --with-version=5.6-504 https://github.com/voodoos/merlin.git#504-rebase
 
       - name: Build and install dependencies
         run: opam install .
@@ -81,7 +81,7 @@ jobs:
       - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: "ocaml-base-compiler.5.3.0"
+          ocaml-compiler: "5.4"
 
       - name: Set git user
         run: |
@@ -90,7 +90,7 @@ jobs:
 
       # Remove this pin once a compatible version of Merlin has been released
       - name: Pin dev Merlin
-        run: opam --cli=2.1 pin --with-version=5.5-503 https://github.com/ocaml/merlin.git#main
+        run: opam --cli=2.1 pin --with-version=5.6-504 https://github.com/voodoos/merlin.git#504-rebase
 
       - name: Install dependencies
         run: |

.ocamlformat

@@ -1,3 +1,3 @@
-version=0.27.0
+version=0.28.1
 profile=janestreet
 ocaml-version=4.14.0

CHANGES.md

@@ -1,4 +1,20 @@
-# unreleased
+# Unreleased
+
+## Features
+
+- Make `code-lens` for nested let bindings configurable (#1567)
+
+## Fixes
+
+- Improve precision of collected metrics timestamps. (#1565)
+
+# 1.24.0
+
+## Features
+
+- Support for OCaml 5.4 (#1559)
+
+# 1.23.1
 
 ## Features
 
@@ -9,6 +25,7 @@
 
 - Fix hover on method calls not showing the type. (#1553, fixes #1552)
 - Fix error on opening `.mll` files (#1557)
+- Ensure compatibility with both yojson 2.0 and 3.0. (#1534)
 
 # 1.23.0
 
@@ -26,7 +43,6 @@
 - Fix `inlay-hint` for function parameters (#1515)
 - More precise diagnostics in the event of a failed identifier search (`Definition_query`) (#1518)
 - Remove `ocamlformat` application after `destruct` (that remove some useful parenthesis) (#1519)
-- Make compatible with Yojson 3.x by removing `Tuple` and `Variant` (#1534)
 
 # 1.22.0
 

dune-project

@@ -56,21 +56,22 @@ possible and does not make any assumptions about IO.
   dyn
   stdune
   (fiber (and (>= 3.1.1) (< 4.0.0)))
-  (ocaml (and (>= 5.3) (< 5.4)))
+  (ocaml (and (>= 5.4) (< 5.5)))
   xdg
   ordering
   dune-build-info
   spawn
   astring
   camlp-streams
   (ppx_expect (and (>= v0.17.0) :with-test))
-  (ocamlformat (and :with-test (= 0.27.0)))
+  (ocamlformat (and :with-test (= 0.28.1)))
   (ocamlc-loc (>= 3.7.0))
   (pp (>= 1.1.2))
   (csexp (>= 1.5))
   (ocamlformat-rpc-lib (>= 0.21.0))
   (odoc :with-doc)
-  (merlin-lib (and (>= 5.5) (< 6.0)))
+  (merlin-lib (and (>= 5.6) (< 5.7)))
+  (ocaml-index :post)
   (ppx_yojson_conv :with-dev-setup)))
 
 (package

ocaml-lsp-server.opam

@@ -31,21 +31,22 @@ depends: [
   "dyn"
   "stdune"
   "fiber" {>= "3.1.1" & < "4.0.0"}
-  "ocaml" {>= "5.3" & < "5.4"}
+  "ocaml" {>= "5.4" & < "5.5"}
   "xdg"
   "ordering"
   "dune-build-info"
   "spawn"
   "astring"
   "camlp-streams"
   "ppx_expect" {>= "v0.17.0" & with-test}
-  "ocamlformat" {with-test & = "0.27.0"}
+  "ocamlformat" {with-test & = "0.28.1"}
   "ocamlc-loc" {>= "3.7.0"}
   "pp" {>= "1.1.2"}
   "csexp" {>= "1.5"}
   "ocamlformat-rpc-lib" {>= "0.21.0"}
   "odoc" {with-doc}
-  "merlin-lib" {>= "5.5" & < "6.0"}
+  "merlin-lib" {>= "5.6" & < "5.7"}
+  "ocaml-index" {post}
   "ppx_yojson_conv" {with-dev-setup}
 ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"

ocaml-lsp-server/docs/ocamllsp/config.md

@@ -15,12 +15,21 @@ interface config {
   */
   extendedHover: { enable : boolean }
 
-  /**
-  * Enable/Disable CodeLens
-  * @default false
-  * @since 1.16
-  */
-  codelens: { enable : boolean }
+  codelens: {
+    /**
+    * Enable/Disable CodeLens
+    * @default false
+    * @since 1.16
+    */
+    enable : boolean,
+
+    /**
+    * Enable CodeLens for nested let bindings
+    * @default false
+    * @since 1.25
+    */
+    forNestedBindings : boolean
+  }
 
   /**
   * Enable/Disable Dune diagnostics

ocaml-lsp-server/src/code_actions/action_inline.ml

@@ -160,7 +160,7 @@ end = struct
     let pat_iter (type k) (iter : I.iterator) (pat : k Typedtree.general_pattern) =
       match pat.pat_desc with
       | Tpat_var (id, { loc; _ }, _) -> paths := Loc.Map.set !paths loc (Pident id)
-      | Tpat_alias (pat, id, { loc; _ }, _) ->
+      | Tpat_alias (pat, id, { loc; _ }, _, _) ->
         paths := Loc.Map.set !paths loc (Pident id);
         I.default_iterator.pat iter pat
       | _ -> I.default_iterator.pat iter pat
@@ -217,9 +217,12 @@ let beta_reduce (paths : Paths.t) (app : Parsetree.expression) =
       if is_pure arg then body else with_let ()
     | Ppat_var param | Ppat_constraint ({ ppat_desc = Ppat_var param; _ }, _) ->
       if is_pure arg then with_subst param else with_let ()
-    | Ppat_tuple pats ->
+    | Ppat_tuple (pats, _) ->
+      let pats = List.map ~f:snd pats in
       (match arg.pexp_desc with
-       | Pexp_tuple args -> List.fold_left2 ~f:beta_reduce_arg ~init:body pats args
+       | Pexp_tuple args ->
+         let args = List.map ~f:snd args in
+         List.fold_left2 ~f:beta_reduce_arg ~init:body pats args
        | _ -> with_let ())
     | _ -> with_let ()
   in
@@ -275,16 +278,16 @@ let inline_edits pipeline task =
         env
         (iter : I.iterator)
         (label : Asttypes.arg_label)
-        (m_arg_expr : Typedtree.expression option)
+        (m_arg_expr : Typedtree.apply_arg)
     =
     match label, m_arg_expr with
     (* handle the labeled argument shorthand `f ~x` when inlining `x` *)
-    | Labelled name, Some { exp_desc = Texp_ident (Pident id, { loc; _ }, _); _ }
+    | Labelled name, Arg { exp_desc = Texp_ident (Pident id, { loc; _ }, _); _ }
     (* inlining is allowed for optional arguments that are being passed a Some
        parameter, i.e. `x` may be inlined in `let x = 1 in (fun ?(x = 0) -> x)
        ~x` *)
     | ( Optional name
-      , Some
+      , Arg
           { exp_desc =
               (* construct is part of desugaring, assumed to be Some *)
               Texp_construct
@@ -294,13 +297,14 @@ let inline_edits pipeline task =
       when Ident.same task.inlined_var id && not_shadowed env ->
       let newText = sprintf "%s:%s" name newText in
       insert_edit newText loc
-    | Optional _, Some ({ exp_desc = Texp_construct _; _ } as arg_expr) ->
+    | Optional _, Arg ({ exp_desc = Texp_construct _; _ } as arg_expr) ->
       iter.expr iter arg_expr
     (* inlining is _not_ allowed for optional arguments that are being passed an
        optional parameter i.e. `x` may _not_ be inlined in `let x = Some 1 in
        (fun ?(x = 0) -> x) ?x` *)
-    | Optional _, Some _ -> ()
-    | _, _ -> Option.iter m_arg_expr ~f:(iter.expr iter)
+    | Optional _, Arg _ -> ()
+    | _, Arg arg -> iter.expr iter arg
+    | _, _ -> ()
   in
   let paths = Paths.of_typedtree task.inlined_expr in
   let inlined_pexpr = find_parsetree_loc_exn pipeline task.inlined_expr.exp_loc in

ocaml-lsp-server/src/code_actions/action_mark_remove_unused.ml

@@ -89,7 +89,7 @@ let rec mark_value_unused_edit name contexts =
                  { range = Range.create ~start:start_pos ~end_:start_pos; newText = "_" }
            | _ -> None
            : Longident.t Loc.loc
-             * Types.label_description
+             * Data_types.label_description
              * Typedtree.value Typedtree.general_pattern
              -> TextEdit.t option)
     in

ocaml-lsp-server/src/config_data.ml

@@ -192,70 +192,91 @@ module InlayHints = struct
 end
 
 module Lens = struct
-  type t = { enable : bool [@default true] }
+  type t =
+    { enable : bool [@default true]
+    ; for_nested_bindings : bool [@key "forNestedBindings"] [@default false]
+    }
   [@@deriving_inline yojson] [@@yojson.allow_extra_fields]
 
   let _ = fun (_ : t) -> ()
 
-  let t_of_yojson =
-    (let _tp_loc = "ocaml-lsp-server/src/config_data.ml.Lens.t" in
-     function
-     | `Assoc field_yojsons as yojson ->
+  
+let t_of_yojson =
+  (let _tp_loc = "ocaml-lsp-server/src/config_data.ml.Lens.t" in
+   function
+   | `Assoc field_yojsons as yojson ->
        let enable_field = ref Ppx_yojson_conv_lib.Option.None
+       and for_nested_bindings_field = ref Ppx_yojson_conv_lib.Option.None
        and duplicates = ref []
        and extra = ref [] in
-       let rec iter = function
-         | (field_name, _field_yojson) :: tail ->
-           (match field_name with
-            | "enable" ->
-              (match Ppx_yojson_conv_lib.( ! ) enable_field with
-               | Ppx_yojson_conv_lib.Option.None ->
-                 let fvalue = bool_of_yojson _field_yojson in
-                 enable_field := Ppx_yojson_conv_lib.Option.Some fvalue
-               | Ppx_yojson_conv_lib.Option.Some _ ->
-                 duplicates := field_name :: Ppx_yojson_conv_lib.( ! ) duplicates)
-            | _ -> ());
-           iter tail
-         | [] -> ()
-       in
-       iter field_yojsons;
-       (match Ppx_yojson_conv_lib.( ! ) duplicates with
-        | _ :: _ ->
-          Ppx_yojson_conv_lib.Yojson_conv_error.record_duplicate_fields
-            _tp_loc
-            (Ppx_yojson_conv_lib.( ! ) duplicates)
-            yojson
-        | [] ->
-          (match Ppx_yojson_conv_lib.( ! ) extra with
-           | _ :: _ ->
-             Ppx_yojson_conv_lib.Yojson_conv_error.record_extra_fields
-               _tp_loc
-               (Ppx_yojson_conv_lib.( ! ) extra)
-               yojson
-           | [] ->
-             let enable_value = Ppx_yojson_conv_lib.( ! ) enable_field in
-             { enable =
-                 (match enable_value with
-                  | Ppx_yojson_conv_lib.Option.None -> true
-                  | Ppx_yojson_conv_lib.Option.Some v -> v)
-             }))
-     | _ as yojson ->
-       Ppx_yojson_conv_lib.Yojson_conv_error.record_list_instead_atom _tp_loc yojson
-     : Ppx_yojson_conv_lib.Yojson.Safe.t -> t)
+       let rec iter =
+         function
+         | (field_name, _field_yojson)::tail ->
+             ((match field_name with
+               | "enable" ->
+                   (match Ppx_yojson_conv_lib.(!) enable_field with
+                    | Ppx_yojson_conv_lib.Option.None ->
+                        let fvalue = bool_of_yojson _field_yojson in
+                        enable_field :=
+                          (Ppx_yojson_conv_lib.Option.Some fvalue)
+                    | Ppx_yojson_conv_lib.Option.Some _ ->
+                        duplicates := (field_name ::
+                          (Ppx_yojson_conv_lib.(!) duplicates)))
+               | "forNestedBindings" ->
+                   (match Ppx_yojson_conv_lib.(!) for_nested_bindings_field
+                    with
+                    | Ppx_yojson_conv_lib.Option.None ->
+                        let fvalue = bool_of_yojson _field_yojson in
+                        for_nested_bindings_field :=
+                          (Ppx_yojson_conv_lib.Option.Some fvalue)
+                    | Ppx_yojson_conv_lib.Option.Some _ ->
+                        duplicates := (field_name ::
+                          (Ppx_yojson_conv_lib.(!) duplicates)))
+               | _ -> ());
+              iter tail)
+         | [] -> () in
+       (iter field_yojsons;
+        (match Ppx_yojson_conv_lib.(!) duplicates with
+         | _::_ ->
+             Ppx_yojson_conv_lib.Yojson_conv_error.record_duplicate_fields
+               _tp_loc (Ppx_yojson_conv_lib.(!) duplicates) yojson
+         | [] ->
+             (match Ppx_yojson_conv_lib.(!) extra with
+              | _::_ ->
+                  Ppx_yojson_conv_lib.Yojson_conv_error.record_extra_fields
+                    _tp_loc (Ppx_yojson_conv_lib.(!) extra) yojson
+              | [] ->
+                  let (enable_value, for_nested_bindings_value) =
+                    ((Ppx_yojson_conv_lib.(!) enable_field),
+                      (Ppx_yojson_conv_lib.(!) for_nested_bindings_field)) in
+                  {
+                    enable =
+                      ((match enable_value with
+                        | Ppx_yojson_conv_lib.Option.None -> true
+                        | Ppx_yojson_conv_lib.Option.Some v -> v));
+                    for_nested_bindings =
+                      ((match for_nested_bindings_value with
+                        | Ppx_yojson_conv_lib.Option.None -> false
+                        | Ppx_yojson_conv_lib.Option.Some v -> v))
+                  })))
+   | _ as yojson ->
+       Ppx_yojson_conv_lib.Yojson_conv_error.record_list_instead_atom _tp_loc
+         yojson : Ppx_yojson_conv_lib.Yojson.Safe.t -> t)
   ;;
 
   let _ = t_of_yojson
 
-  let yojson_of_t =
-    (function
-     | { enable = v_enable } ->
+  
+let yojson_of_t =
+  (function
+   | { enable = v_enable; for_nested_bindings = v_for_nested_bindings } ->
        let bnds : (string * Ppx_yojson_conv_lib.Yojson.Safe.t) list = [] in
        let bnds =
-         let arg = yojson_of_bool v_enable in
-         ("enable", arg) :: bnds
-       in
-       `Assoc bnds
-     : t -> Ppx_yojson_conv_lib.Yojson.Safe.t)
+         let arg = yojson_of_bool v_for_nested_bindings in
+         ("forNestedBindings", arg) :: bnds in
+       let bnds =
+         let arg = yojson_of_bool v_enable in ("enable", arg) :: bnds in
+       `Assoc bnds : t -> Ppx_yojson_conv_lib.Yojson.Safe.t)
   ;;
 
   let _ = yojson_of_t
@@ -921,7 +942,7 @@ let _ = yojson_of_t
 [@@@end]
 
 let default =
-  { codelens = Some { enable = false }
+  { codelens = Some { enable = false; for_nested_bindings = false }
   ; extended_hover = Some { enable = false }
   ; standard_hover = Some { enable = true }
   ; inlay_hints =

ocaml-lsp-server/src/document.ml

@@ -160,10 +160,10 @@ end = struct
     let task =
       match
         Lev_fiber.Thread.task t.thread ~f:(fun () ->
-          let start = Unix.time () in
+          let start = Unix.gettimeofday () in
           let pipeline = make_pipeline () in
           let res = Mpipeline.with_pipeline pipeline (fun () -> f pipeline) in
-          let stop = Unix.time () in
+          let stop = Unix.gettimeofday () in
           res, start, stop)
       with
       | Error `Stopped -> assert false