Merge in upstream main for 5.2 merge

CHANGES.md

@@ -1,14 +1,3 @@
-<<<<<<< HEAD
-||||||| 7b73c6aa3f
-merlin NEXT_VERSION
-===================
-
-  + merlin binary
-    - Fix a follow-up issue to the preference of non-ghost nodes introduced in #1660 (#1690, fixes #1689)
-  + editor modes
-    - vim: load merlin when Vim is compiled with +python3/dyn (e.g. MacVim)
-
-=======
 unreleased
 ==========
 
@@ -109,7 +98,6 @@ Fri Dec  1 15:00:42 CET 2023
     - vim: load merlin when Vim is compiled with +python3/dyn (e.g. MacVim)
     - emacs: highlight only first error line by default (#1693, fixes #1663)
 
->>>>>>> upstream/main
 merlin 4.12
 ===========
 Tue Sep 26 17:45:42 CEST 2023
@@ -234,7 +222,6 @@ Fri Feb 24 16:55:42 CEST 2023
       xref recognises operators and binding operators at the cursor position;
       bad locations are filtered out (#1385, fixes #1410, @mattiase)
   + test suite
-    - Add a test for incorrect alert defaults (#1559)
     - Add multiple tests for locate over ill-typed expressions (#1546)
     - Add non-regression tests for other fixes in this release
     - Add a test for incorrect alert defaults (#1559)
@@ -249,16 +236,6 @@ Thu Dec 13 11:49:42 CEST 2022
       fixes #1518)
     - Mark some C variables as unused to remove warnings (#1541, @antalsz)
 
-merlin 4.7.1
-==========
-Thu Dec 13 11:49:42 CEST 2022
-
-  + merlin binary
-    - Restore compatibility with the compiler's command line by accepting
-      the `-safe-string` flag as a no-op instead of rejecting it. (#1544,
-      fixes #1518)
-    - Mark some C variables as unused to remove warnings (#1541, @antalsz)
-
 merlin 4.7
 ==========
 Thu Nov 24 17:49:42 CEST 2022

README.md

@@ -192,19 +192,9 @@ If you're a Merlin user and depend on our public API, we recommend that you cont
 Next Steps
 ==========
 
-<<<<<<< HEAD
-To use Merlin with a multi-file project, it is necessary to have a [.merlin](https://github.com/ocaml/merlin/wiki/project-configuration) file
-unless your project is built using dune.
-Note that, in a project using Dune, user-created `.merlin` files will take precedence over the configuration provided by Dune to Merlin.
-||||||| 7b73c6aa3f
-To use Merlin with a multi-file project, it is necessary to have a [.merlin](https://github.com/ocaml/merlin/wiki/project-configuration) file, 
-unless your project is built using Dune.
-Note that, in a project using Dune, user-created `.merlin` files will take precedence over the configuration provided by Dune to Merlin. 
-=======
 To use Merlin with a multi-file project, it is necessary to have a [.merlin](https://github.com/ocaml/merlin/wiki/project-configuration) file,
 unless your project is built using Dune.
 Note that, in a project using Dune, user-created `.merlin` files will take precedence over the configuration provided by Dune to Merlin.
->>>>>>> upstream/main
 
 Read more in the [wiki](https://github.com/ocaml/merlin/wiki) to learn how to make full use of Merlin in your projects.
 

bench.Dockerfile

@@ -1,73 +1 @@
-<<<<<<< HEAD
-FROM ocaml/opam:debian-11-ocaml-5.0
-
-WORKDIR /app
-
-RUN sudo apt-get update
-RUN sudo apt-get -y install jq
-COPY . .
-RUN sudo chown -R opam /app
-RUN eval $(opam env)
-
-# install merlin
-RUN opam install .
-
-# install merl-an
-## cache workaround: https://github.com/ocurrent/current-bench/issues/468#issuecomment-1621030354
-ADD https://api.github.com/repos/pitag-ha/merl-an/git/refs/heads/main .merl-an-info
-RUN opam pin -y merl-an https://github.com/pitag-ha/merl-an.git
-
-RUN eval $(opam env)
-
-# create directory for projects to run benchmarks on
-RUN sudo mkdir /projects
-RUN sudo chown opam /projects
-WORKDIR /projects
-
-# build irmin
-RUN git clone https://github.com/mirage/irmin.git
-WORKDIR /projects/irmin
-RUN git checkout 8da4d16e7cc8beddfc8a824feca325426bae08a9
-RUN sudo apt install -y gnuplot-x11 libgmp-dev pkg-config libffi-dev
-RUN opam switch import /app/bench/irmin.opam.export --no-checksums
-RUN opam exec -- dune build
-
-WORKDIR /app
-||||||| 7b73c6aa3f
-FROM ocaml/opam:ubuntu-20.04-ocaml-4.14
-
-WORKDIR /app
-
-RUN sudo apt-get update
-RUN sudo apt-get -y install jq
-COPY . .
-RUN sudo chown -R opam /app
-RUN eval $(opam env)
-
-# install merlin
-RUN opam install .
-
-# install merl-an
-## cache workaround: https://github.com/ocurrent/current-bench/issues/468#issuecomment-1621030354
-ADD https://api.github.com/repos/pitag-ha/merl-an/git/refs/heads/main .merl-an-info
-RUN opam pin -y merl-an https://github.com/pitag-ha/merl-an.git
-
-RUN eval $(opam env)
-
-# create directory for projects to run benchmarks on
-RUN sudo mkdir /projects
-RUN sudo chown opam /projects
-WORKDIR /projects
-
-# build irmin
-RUN git clone https://github.com/mirage/irmin.git
-WORKDIR /projects/irmin
-RUN git checkout 8da4d16e7cc8beddfc8a824feca325426bae08a9
-RUN sudo apt install -y gnuplot-x11 libgmp-dev pkg-config libffi-dev
-RUN opam switch import /app/bench/irmin.opam.export --no-checksums
-RUN opam exec -- dune build
-
-WORKDIR /app
-=======
 FROM ocaml/opam:ubuntu-20.04-ocaml-5.2
->>>>>>> upstream/main

dot-merlin-reader.opam

@@ -11,13 +11,7 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-<<<<<<< HEAD
-  "ocaml" {>= "5.1" & < "5.2" }
-||||||| 7b73c6aa3f
-  "ocaml" {>= "4.08" & < "5.0"}
-=======
   "ocaml" {>= "5.2" }
->>>>>>> upstream/main
   "dune" {>= "2.9.0"}
   "merlin-lib" {>= "5.0"}
   "ocamlfind" {>= "1.6.0"}

emacs/merlin.el

@@ -1791,17 +1791,10 @@ Empty string defaults to jumping to all these."
         (dolist (pos positions)
           (let* ((start (assoc 'start pos))
                  (end (assoc 'end pos))
-<<<<<<< HEAD
-                 (occ-buff (find-file-noselect (cdr (assoc 'file pos))))
-                 (marker (with-current-buffer occ-buff
-                          (copy-marker (merlin--point-of-pos start))))
-||||||| 7b73c6aa3f
-=======
                  (file (cdr (assoc 'file pos)))
                  (occ-buff (if file (find-file-noselect file) src-buff))
                  (marker (with-current-buffer occ-buff
                           (copy-marker (merlin--point-of-pos start))))
->>>>>>> upstream/main
                  (line (cdr (assoc 'line start)))
                  (start-buf-pos (with-current-buffer occ-buff
                                   (merlin--point-of-pos start)))
@@ -1817,15 +1810,7 @@ Empty string defaults to jumping to all these."
                                             marker
                                             start-buf-pos
                                             end-buf-pos
-<<<<<<< HEAD
-                                            occ-buff))))
-
-||||||| 7b73c6aa3f
-                                            src-buff))))
-
-=======
                                             occ-buff))))
->>>>>>> upstream/main
             ;; Insert the critical text properties that occur-mode
             ;; makes use of
             (add-text-properties start-offset
@@ -1842,20 +1827,6 @@ Empty string defaults to jumping to all these."
                        (or (not (equal line pending-line))
                            (not (equal previous-buf occ-buff))))
               (insert pending-lines-text))
-<<<<<<< HEAD
-
-            (when (not (equal previous-buf occ-buff))
-              (insert (propertize (format "Occurrences in buffer %s:"
-                                          ;(length lst)
-                                          occ-buff)
-                                  'font-lock-face
-                                    list-matching-lines-buffer-name-face
-                                  'read-only t
-                                  'occur-title occ-buff))
-              (insert "\n"))
-
-||||||| 7b73c6aa3f
-=======
 
             (when (not (equal previous-buf occ-buff))
               (insert (propertize (format "Occurrences in buffer %s:"
@@ -1867,7 +1838,6 @@ Empty string defaults to jumping to all these."
                                   'occur-title occ-buff))
               (insert "\n"))
 
->>>>>>> upstream/main
             (setq pending-line line)
             (setq previous-buf occ-buff)
             (setq pending-lines-text lines-text)))

merlin-lib.opam

@@ -10,16 +10,8 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-<<<<<<< HEAD
-  "ocaml" {>= "5.1" & < "5.2"}
-  "dune" {>= "2.9.0"}
-||||||| 7b73c6aa3f
-  "ocaml" {>= "4.14" & < "4.15"}
-  "dune" {>= "2.9.0"}
-=======
   "ocaml" {>= "5.2" & < "5.3"}
   "dune" {>= "3.0.0"}
->>>>>>> upstream/main
   "csexp" {>= "1.5.1"}
   "menhir"    {dev & = "20210419"}
   "menhirLib" {dev & = "20210419"}

merlin.opam

@@ -11,16 +11,8 @@ build: [
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
-<<<<<<< HEAD
-  "ocaml" {>= "5.1" & < "5.2"}
-  "dune" {>= "2.9.0"}
-||||||| 7b73c6aa3f
-  "ocaml" {>= "4.14" & < "4.15"}
-  "dune" {>= "2.9.0"}
-=======
   "ocaml" {>= "5.2" & < "5.3"}
   "dune" {>= "3.0.0"}
->>>>>>> upstream/main
   "merlin-lib" {= version}
   "dot-merlin-reader" {>= "5.0"}
   "ocaml-index" {>= "1.0" & post}

src/analysis/ast_iterators.ml

@@ -1,57 +1,3 @@
-<<<<<<< HEAD
-open Std
-open Typedtree
-
-let {Logger. log} = Logger.for_section "iterators"
-
-(* The compiler contains an iterator that aims to gather definitions but
-ignores local values like let-in expressions and local type definition. To
-provide occurrences in the active buffer we extend the compiler's iterator with
-these cases. *)
-let iter_on_defs ~uid_to_locs_tbl =
-  let log = log ~title:"iter_on_defs" in
-  let register_uid uid fragment =
-    let loc = Misc_utils.loc_of_decl ~uid fragment in
-    Option.iter loc ~f:(fun loc ->
-      Types.Uid.Tbl.add uid_to_locs_tbl uid loc)
-  in
-  let iter_decl = Cmt_format.iter_on_declarations ~f:register_uid in
-  let register_uid uid loc =
-    Types.Uid.Tbl.add uid_to_locs_tbl uid loc
-  in
-  { iter_decl with
-    expr = (fun sub ({ exp_extra; _ } as expr) ->
-      List.iter exp_extra ~f:(fun (exp_extra, _loc, _attr) ->
-        match exp_extra with
-        | Texp_newtype' (typ_id, typ_name, _, uid) ->
-          log "Found newtype %s wit id %a (%a)\n%!" typ_name.txt
-            Logger.fmt (Fun.flip Ident.print_with_scope typ_id)
-            Logger.fmt (fun fmt -> Location.print_loc fmt typ_name.loc);
-          register_uid uid typ_name;
-          ()
-        | _ -> ());
-      iter_decl.expr sub expr);
-  }
-
-let build_uid_to_locs_tbl ~(local_defs : Mtyper.typedtree) () =
-  let uid_to_locs_tbl : string Location.loc Types.Uid.Tbl.t =
-    Types.Uid.Tbl.create 64
-  in
-  let iter = iter_on_defs ~uid_to_locs_tbl in
-  begin match local_defs with
-  | `Interface sign ->
-    iter.signature iter sign
-  | `Implementation str ->
-    iter.structure iter str end;
-  uid_to_locs_tbl
-
-let iter_on_usages ~f (local_defs : Mtyper.typedtree) =
-  let iter = Cmt_format.iter_on_occurrences ~f in
-  begin match local_defs with
-  | `Interface signature -> iter.signature iter signature
-  | `Implementation structure -> iter.structure iter structure end
-||||||| 7b73c6aa3f
-=======
 open Std
 open Typedtree
 
@@ -165,7 +111,7 @@ let iter_on_defs ~uid_to_locs_tbl =
     expr = (fun sub ({ exp_extra; _ } as expr) ->
       List.iter exp_extra ~f:(fun (exp_extra, _loc, _attr) ->
         match exp_extra with
-        | Texp_newtype' (typ_id, typ_name, uid) ->
+        | Texp_newtype' (typ_id, typ_name, _, uid) ->
           log "Found newtype %s wit id %a (%a)\n%!" typ_name.txt
             Logger.fmt (Fun.flip Ident.print_with_scope typ_id)
             Logger.fmt (fun fmt -> Location.print_loc fmt typ_name.loc);
@@ -197,4 +143,3 @@ let iter_on_usages ~f (local_defs : Mtyper.typedtree) =
 let iterator_on_usages ~f =
   let occ_iter = Cmt_format.iter_on_occurrences ~f in
   iter_only_visible occ_iter
->>>>>>> upstream/main

src/analysis/completion.ml

@@ -660,15 +660,9 @@ let branch_complete buffer ?get_doc ?target_type ?kinds ~keywords prefix =
                 let lbls = Datarepr.labels_of_type p decl in
                 let labels = List.map lbls ~f:(fun (_,lbl) ->
                     try
-<<<<<<< HEAD
-                      let _, lbl_arg, lbl_res = Ctype.instance_label ~fixed:false lbl in
-||||||| 7b73c6aa3f
-                      let _, lbl_arg, lbl_res = Ctype.instance_label false lbl in
-=======
                       let _, lbl_arg, lbl_res =
                         Ctype.instance_label ~fixed:false lbl
                       in
->>>>>>> upstream/main
                       begin try
                           Ctype.unify_var env ty lbl_res;
                         with _ -> ()