Skip to content

Commit b1e7955

Browse files
voodoosvoodoos
committed
[new release] merlin (4 packages) (5.5-503)
CHANGES: Tue Jun 24 16:10:42 CEST 2025 + merlin library - Expose utilities to manipulate typed-holes in `Merlin_analysis.Typed_hole` (ocaml/merlin#1888) - `locate` can now disambiguate between files with identical names and contents (ocaml/merlin#1882) - `occurrences` now reports stale files (ocaml/merlin#1885) - `inlay-hints` fix inlay hints on function parameters (ocaml/merlin#1923) - Fix issues with ident validation and Lid comparison for occurrences (ocaml/merlin#1924) - Handle class type in outline (ocaml/merlin#1932) - Handle locally defined value in outline (ocaml/merlin#1936) - Fix a typer issue triggering assertions in the short-paths graph (ocaml/merlin#1935, fixes ocaml/merlin#1913) - Downstreamed a typer fix from 5.3.X that would trigger assertions linked to scopes bit masks when backtracking the typer cache (ocaml/merlin#1935) - Add a new selection field to outline results that contains the location of the symbol itself. (ocaml/merlin#1942) - Fix destruct hanging when printing patterns with (::). (ocaml/merlin#1944, fixes ocaml/ocaml-lsp#1489) - Reproduce and fix a handful of jump-to-definition (locate) issues (ocaml/merlin#1930, fixes ocaml/merlin#1580 and ocaml/merlin#1588, workaround for ocaml/merlin#1934) + ocaml-index - Improve the granularity of index reading by segmenting the marshalization of the involved data-structures. (ocaml/merlin#1889) + test suite - Add a test case illustrating wrong open order proposed in issue ocaml/merlin#1900. (ocaml/merlin#1901)
1 parent ba7c8a6 commit b1e7955

File tree

4 files changed

+190
-0
lines changed
  • packages
    • dot-merlin-reader/dot-merlin-reader.5.5-503
    • merlin-lib/merlin-lib.5.5-503
    • merlin/merlin.5.5-503
    • ocaml-index/ocaml-index.5.5-503

4 files changed

+190
-0
lines changed

‎packages/dot-merlin-reader/dot-merlin-reader.5.5-503/opam‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
opam-version: "2.0"
2+
maintainer: "[email protected]"
3+
authors: "The Merlin team"
4+
synopsis: "Reads config files for merlin"
5+
homepage: "https://github.com/ocaml/merlin"
6+
bug-reports: "https://github.com/ocaml/merlin/issues"
7+
dev-repo: "git+https://github.com/ocaml/merlin.git"
8+
license: "MIT"
9+
x-maintenance-intent: ["(latest)"]
10+
build: [
11+
["dune" "subst"] {dev}
12+
["dune" "build" "-p" name "-j" jobs]
13+
]
14+
depends: [
15+
"ocaml" {>= "5.2" }
16+
"dune" {>= "3.0.0"}
17+
"merlin-lib" {= version}
18+
"ocamlfind" {>= "1.6.0"}
19+
]
20+
description:
21+
"Helper process: reads .merlin files and outputs the normalized content to
22+
stdout."
23+
url {
24+
src:
25+
"https://github.com/ocaml/merlin/releases/download/v5.5-503/merlin-5.5-503.tbz"
26+
checksum: [
27+
"sha256=67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1"
28+
"sha512=1fb3b5180d36aa82b82a319e15b743b802b6888f0dc67645baafdb4e18dfc23a7b90064ec9bc42f7424061cf8cde7f8839178d8a8537bf4596759f3ff4891873"
29+
]
30+
}
31+
x-commit-hash: "8b88b89ee7431a23eaf95e4e02e45dc65595aa74"

‎packages/merlin-lib/merlin-lib.5.5-503/opam‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
opam-version: "2.0"
2+
maintainer: "[email protected]"
3+
authors: "The Merlin team"
4+
homepage: "https://github.com/ocaml/merlin"
5+
bug-reports: "https://github.com/ocaml/merlin/issues"
6+
dev-repo: "git+https://github.com/ocaml/merlin.git"
7+
license: "MIT"
8+
x-maintenance-intent: ["(latest)"]
9+
build: [
10+
["dune" "subst"] {dev}
11+
["dune" "build" "-p" name "-j" jobs]
12+
]
13+
depends: [
14+
"ocaml" {>="5.3" & <"5.4"}
15+
"dune" {>= "3.0.0"}
16+
"csexp" {>= "1.5.1"}
17+
"alcotest" {with-test & >= "1.3.0" }
18+
"menhir" {dev & >= "20201216"}
19+
"menhirLib" {dev & >= "20201216"}
20+
"menhirSdk" {dev & >= "20201216"}
21+
]
22+
synopsis:
23+
"Merlin's libraries"
24+
description:
25+
"These libraries provides access to low-level compiler interfaces and the
26+
standard higher-level merlin protocol. The library is provided as-is, is not
27+
thoroughly documented, and its public API might break with any new release."
28+
url {
29+
src:
30+
"https://github.com/ocaml/merlin/releases/download/v5.5-503/merlin-5.5-503.tbz"
31+
checksum: [
32+
"sha256=67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1"
33+
"sha512=1fb3b5180d36aa82b82a319e15b743b802b6888f0dc67645baafdb4e18dfc23a7b90064ec9bc42f7424061cf8cde7f8839178d8a8537bf4596759f3ff4891873"
34+
]
35+
}
36+
x-commit-hash: "8b88b89ee7431a23eaf95e4e02e45dc65595aa74"

‎packages/merlin/merlin.5.5-503/opam‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
opam-version: "2.0"
2+
maintainer: "[email protected]"
3+
authors: "The Merlin team"
4+
homepage: "https://github.com/ocaml/merlin"
5+
bug-reports: "https://github.com/ocaml/merlin/issues"
6+
dev-repo: "git+https://github.com/ocaml/merlin.git"
7+
license: "MIT"
8+
x-maintenance-intent: ["(latest)"]
9+
build: [
10+
["dune" "subst"] {dev}
11+
["dune" "build" "-p" name "-j" jobs]
12+
["dune" "runtest" "-p" name "-j" jobs] {with-test}
13+
]
14+
depends: [
15+
"dune" {>= "3.0.0"}
16+
"merlin-lib" {= version}
17+
"dot-merlin-reader" {= version}
18+
"ocaml-index" {>= "1.0" & post}
19+
"yojson" {>= "2.0.0"}
20+
"conf-jq" {with-test}
21+
"ppxlib" {with-test}
22+
]
23+
conflicts: [
24+
"seq" {!= "base"}
25+
]
26+
synopsis:
27+
"Editor helper, provides completion, typing and source browsing in Vim and Emacs"
28+
description:
29+
"Merlin is an assistant for editing OCaml code. It aims to provide the features available in modern IDEs: error reporting, auto completion, source browsing and much more."
30+
post-messages: [
31+
"merlin installed.
32+
33+
Quick setup for VIM
34+
-------------------
35+
Append this to your .vimrc to add merlin to vim's runtime-path:
36+
let g:opamshare = substitute(system('opam var share'),'\\n$','','''')
37+
execute \"set rtp+=\" . g:opamshare . \"/merlin/vim\"
38+
39+
Also run the following line in vim to index the documentation:
40+
:execute \"helptags \" . g:opamshare . \"/merlin/vim/doc\"
41+
42+
Quick setup for EMACS
43+
-------------------
44+
Add opam emacs directory to your load-path by appending this to your .emacs:
45+
(let ((opam-share (ignore-errors (car (process-lines \"opam\" \"var\" \"share\")))))
46+
(when (and opam-share (file-directory-p opam-share))
47+
;; Register Merlin
48+
(add-to-list 'load-path (expand-file-name \"emacs/site-lisp\" opam-share))
49+
(autoload 'merlin-mode \"merlin\" nil t nil)
50+
;; Automatically start it in OCaml buffers
51+
(add-hook 'tuareg-mode-hook 'merlin-mode t)
52+
(add-hook 'caml-mode-hook 'merlin-mode t)
53+
;; Use opam switch to lookup ocamlmerlin binary
54+
(setq merlin-command 'opam)
55+
;; To easily change opam switches within a given Emacs session, you can
56+
;; install the minor mode https://github.com/ProofGeneral/opam-switch-mode
57+
;; and use one of its \"OPSW\" menus.
58+
))
59+
Take a look at https://github.com/ocaml/merlin for more information
60+
61+
Quick setup with opam-user-setup
62+
--------------------------------
63+
64+
Opam-user-setup support Merlin.
65+
66+
$ opam user-setup install
67+
68+
should take care of basic setup.
69+
See https://github.com/OCamlPro/opam-user-setup
70+
"
71+
{success & !user-setup:installed}
72+
]
73+
url {
74+
src:
75+
"https://github.com/ocaml/merlin/releases/download/v5.5-503/merlin-5.5-503.tbz"
76+
checksum: [
77+
"sha256=67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1"
78+
"sha512=1fb3b5180d36aa82b82a319e15b743b802b6888f0dc67645baafdb4e18dfc23a7b90064ec9bc42f7424061cf8cde7f8839178d8a8537bf4596759f3ff4891873"
79+
]
80+
}
81+
x-commit-hash: "8b88b89ee7431a23eaf95e4e02e45dc65595aa74"

‎packages/ocaml-index/ocaml-index.5.5-503/opam‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
opam-version: "2.0"
2+
synopsis: "A tool that indexes value usages from cmt files"
3+
description:
4+
"ocaml-index should integrate with the build system to index codebase and allow tools such as Merlin to perform project-wide occurrences queries."
5+
maintainer: ["[email protected]"]
6+
authors: ["[email protected]"]
7+
license: "MIT"
8+
homepage: "https://github.com/ocaml/merlin/ocaml-index"
9+
bug-reports: "https://github.com/ocaml/merlin/issues"
10+
x-maintenance-intent: ["(latest)"]
11+
depends: [
12+
"dune" {>= "3.0.0"}
13+
"ocaml" {>= "5.3"}
14+
"merlin-lib" {= version}
15+
"odoc" {with-doc}
16+
]
17+
build: [
18+
["dune" "subst"] {dev}
19+
[
20+
"dune"
21+
"build"
22+
"-p"
23+
name
24+
"-j"
25+
jobs
26+
"--promote-install-files=false"
27+
"@install"
28+
"@runtest" {with-test}
29+
"@doc" {with-doc}
30+
]
31+
["dune" "install" "-p" name "--create-install-files" name]
32+
]
33+
dev-repo: "git+https://github.com/ocaml/merlin.git"
34+
url {
35+
src:
36+
"https://github.com/ocaml/merlin/releases/download/v5.5-503/merlin-5.5-503.tbz"
37+
checksum: [
38+
"sha256=67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1"
39+
"sha512=1fb3b5180d36aa82b82a319e15b743b802b6888f0dc67645baafdb4e18dfc23a7b90064ec9bc42f7424061cf8cde7f8839178d8a8537bf4596759f3ff4891873"
40+
]
41+
}
42+
x-commit-hash: "8b88b89ee7431a23eaf95e4e02e45dc65595aa74"

0 commit comments

Comments
 (0)