Skip to content

Commit

Permalink
[new release] merlin and merlin-lib (4.8-500)
Browse files Browse the repository at this point in the history
CHANGES:

Fri Feb 24 16:55:42 CEST 2023

  + merlin binary
    - Recognize OCaml 5.0 cmi magic number in compiler version mismatch message
      (ocaml/merlin#1554, fixes ocaml/merlin#1553)
    - Upgrade Merlin from the RC2 to the stable 5.0.0 compiler release (ocaml/merlin#1559,
      fixes ocaml/merlin#1558)
    - Improve type-enclosing behaviour when used on records' labels (ocaml/merlin#1565,
      fixes ocaml/merlin#1564)
    - Restore compatibility with the compiler's command line by accepting the
      `-safe-string` flag as a no-op instead of rejecting it (ocaml/merlin#1544, fixes
      ocaml/merlin#1518)
    - Traverse aliases when jumping to declaration. This matches
      jump-to-definition's behavior (ocaml/merlin#1563)
    - Improve locate's behavior in various ill-typed expressions (ocaml/merlin#1546, fixes
      ocaml/merlin#1567 and partially ocaml/merlin#1543)
    - Correctly traverse patterns when looking for docs in the typedtree (ocaml/merlin#1572)
    - Get documentation when the declaration or definition is selected (ocaml/merlin#1542,
      fixes ocaml/merlin#1540)
    - On Windows, change to a harmless directory when launching server to avoid
      locking down current directory (ocaml/merlin#1569, fixes ocaml/merlin#1474)
  + editor modes
    - emacs: Fix misuse of `eq` comparison (ocaml/merlin#1549, @mattiase)
    - emacs: xref works from context menus; better highlighting of xref matches;
      xref recognises operators and binding operators at the cursor position;
      bad locations are filtered out (ocaml/merlin#1385, fixes ocaml/merlin#1410, @mattiase)
  + test suite
    - Add a test for incorrect alert defaults (ocaml/merlin#1559)
    - Add multiple tests for locate over ill-typed expressions (ocaml/merlin#1546)
    - Add non-regression tests for other fixes in this release
  • Loading branch information
voodoos committed Feb 24, 2023
1 parent e611a5f commit 86ebee5
Show file tree
Hide file tree
Showing 2 changed files with 112 additions and 0 deletions.
34 changes: 34 additions & 0 deletions packages/merlin-lib/merlin-lib.4.8-500/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
opam-version: "2.0"
maintainer: "[email protected]"
authors: "The Merlin team"
homepage: "https://github.com/ocaml/merlin"
bug-reports: "https://github.com/ocaml/merlin/issues"
dev-repo: "git+https://github.com/ocaml/merlin.git"
license: "MIT"
build: [
["dune" "subst"] {dev}
["dune" "build" "-p" name "-j" jobs]
]
depends: [
"ocaml" {>= "5.0" & < "5.1"}
"dune" {>= "2.9.0"}
"csexp" {>= "1.5.1"}
"menhir" {dev & >= "20201216"}
"menhirLib" {dev & >= "20201216"}
"menhirSdk" {dev & >= "20201216"}
]
synopsis:
"Merlin's libraries"
description:
"These libraries provides access to low-level compiler interfaces and the
standard higher-level merlin protocol. The library is provided as-is, is not
thoroughly documented, and its public API might break with any new release."
url {
src:
"https://github.com/ocaml/merlin/releases/download/v4.8-500/merlin-4.8-500.tbz"
checksum: [
"sha256=9f93472aea34fe56667deed6b24aa75b7c66d52d0f9972924bddc10caae98c22"
"sha512=b1498064c69305d72bf833e1652e4a0947540c736aa17b58f03af35dd7ca191250acc6a929f1e5b2010bc0fc30fc7074d8b20a5cbad8d9685715df2746c12839"
]
}
x-commit-hash: "1fbb47f7559fd4145cee3661cb70e2fae711df53"
78 changes: 78 additions & 0 deletions packages/merlin/merlin.4.8-500/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
opam-version: "2.0"
maintainer: "[email protected]"
authors: "The Merlin team"
homepage: "https://github.com/ocaml/merlin"
bug-reports: "https://github.com/ocaml/merlin/issues"
dev-repo: "git+https://github.com/ocaml/merlin.git"
license: "MIT"
build: [
["dune" "subst"] {dev}
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs] {with-test}
]
depends: [
"ocaml" {>= "5.0" & < "5.1"}
"dune" {>= "2.9.0"}
"merlin-lib" {= version}
"dot-merlin-reader" {>= "4.6"}
"yojson" {>= "2.0.0"}
"conf-jq" {with-test}
"ppxlib" {with-test}
]
conflicts: [
"seq" {!= "base"}
"base-effects"
]
synopsis:
"Editor helper, provides completion, typing and source browsing in Vim and Emacs"
description:
"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."
post-messages: [
"merlin installed.

Quick setup for VIM
-------------------
Append this to your .vimrc to add merlin to vim's runtime-path:
let g:opamshare = substitute(system('opam var share'),'\\n$','','''')
execute \"set rtp+=\" . g:opamshare . \"/merlin/vim\"

Also run the following line in vim to index the documentation:
:execute \"helptags \" . g:opamshare . \"/merlin/vim/doc\"

Quick setup for EMACS
-------------------
Add opam emacs directory to your load-path by appending this to your .emacs:
(let ((opam-share (ignore-errors (car (process-lines \"opam\" \"var\" \"share\")))))
(when (and opam-share (file-directory-p opam-share))
;; Register Merlin
(add-to-list 'load-path (expand-file-name \"emacs/site-lisp\" opam-share))
(autoload 'merlin-mode \"merlin\" nil t nil)
;; Automatically start it in OCaml buffers
(add-hook 'tuareg-mode-hook 'merlin-mode t)
(add-hook 'caml-mode-hook 'merlin-mode t)
;; Use opam switch to lookup ocamlmerlin binary
(setq merlin-command 'opam)))

Take a look at https://github.com/ocaml/merlin for more information

Quick setup with opam-user-setup
--------------------------------

Opam-user-setup support Merlin.

$ opam user-setup install

should take care of basic setup.
See https://github.com/OCamlPro/opam-user-setup
"
{success & !user-setup:installed}
]
url {
src:
"https://github.com/ocaml/merlin/releases/download/v4.8-500/merlin-4.8-500.tbz"
checksum: [
"sha256=9f93472aea34fe56667deed6b24aa75b7c66d52d0f9972924bddc10caae98c22"
"sha512=b1498064c69305d72bf833e1652e4a0947540c736aa17b58f03af35dd7ca191250acc6a929f1e5b2010bc0fc30fc7074d8b20a5cbad8d9685715df2746c12839"
]
}
x-commit-hash: "1fbb47f7559fd4145cee3661cb70e2fae711df53"

0 comments on commit 86ebee5

Please sign in to comment.