forked from ocaml/opam-repository
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[new release] merlin-lib, merlin (4.14-501/500/414)
CHANGES:
Thu Feb 22 14:00:42 CET 2024
+ merlin binary
- Add a "heap_mbytes" field to Merlin server responses to report heap usage (ocaml/merlin#1717)
- Add cache stats to telemetry (ocaml/merlin#1711)
- Add new SyntaxDocument command to find information about the node under the cursor (ocaml/merlin#1706)
- Fix `FLG -pp ppx.exe -as-pp/-dump-ast` use of invalid shell redirection when
direct process launch on Windows. (ocaml/merlin#1723, fixes ocaml/merlin#1722)
- Add a query_num field to the `ocamlmerlin` responses to detect server crashes (ocaml/merlin#1716)
- Jump to cases within a match statement (ocaml/merlin#1726)
- Jump to `module-type` (ocaml/merlin#1728, partially fixes ocaml/merlin#1656)
- Exposes stable functions for configuration handling and pattern variable
destruction. (ocaml/merlin#1730)
+ editor modes
- vim: load merlin under the ocamlinterface and ocamllex filetypes (ocaml/merlin#1340)
- Fix merlinpp not using binary file open (ocaml/merlin#1725, fixes ocaml/merlin#1724)- Loading branch information
Showing
6 changed files
with
345 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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" {>= "4.14" & < "4.15"} | ||
| "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.14-414/merlin-4.14-414.tbz" | ||
| checksum: [ | ||
| "sha256=79018ccaa37c1501dd5c4d5cf78bc3420d641b1e82443662981c5472d973993d" | ||
| "sha512=ebefec44c7f54b10aa85895baacecf778930ee0c4cd5a257836755ccadd9018c20379511e254efa98ed7d48fff9ba9eeb93b45a722cc1d2d61f51570cc57985d" | ||
| ] | ||
| } | ||
| x-commit-hash: "7017cc271403487756e412349f3718a8ba2e6a36" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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.14-500/merlin-4.14-500.tbz" | ||
| checksum: [ | ||
| "sha256=ec23f324f875520cd8897f303cc6d4e595f3d7000914d410729f16b86ad1d70e" | ||
| "sha512=8db22100cc0af65b08f456a2a7af84e75396f5869ee7552f1f5888a1c0279d1d85e6eecb3a677ae6f0973a99823cddba0563843ce216197255667342ef161885" | ||
| ] | ||
| } | ||
| x-commit-hash: "be37d5589bc90c8ef10bb5bbd49108cd3b7dbe65" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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.1.1" & < "5.2"} | ||
| "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.14-501/merlin-4.14-501.tbz" | ||
| checksum: [ | ||
| "sha256=b7e9e96e924058c2ce429642788aa2e390720d441e224538bcf494a65203a292" | ||
| "sha512=734d760b1f73652bbd1d25736d08336c2df15f4eaa1d4c7aed345e83d1375b54266cb78dbeb698870a668633fbd2c7fece4dd161a50fba92f245dfad4b69c4c9" | ||
| ] | ||
| } | ||
| x-commit-hash: "7d7f525180f5979516e10c05d0cd49823edb5ef1" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| 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" {>= "4.14" & < "4.15"} | ||
| "dune" {>= "2.9.0"} | ||
| "merlin-lib" {= version} | ||
| "dot-merlin-reader" {>= "4.9"} | ||
| "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) | ||
| ;; To easily change opam switches within a given Emacs session, you can | ||
| ;; install the minor mode https://github.com/ProofGeneral/opam-switch-mode | ||
| ;; and use one of its \"OPSW\" menus. | ||
| )) | ||
| 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.14-414/merlin-4.14-414.tbz" | ||
| checksum: [ | ||
| "sha256=79018ccaa37c1501dd5c4d5cf78bc3420d641b1e82443662981c5472d973993d" | ||
| "sha512=ebefec44c7f54b10aa85895baacecf778930ee0c4cd5a257836755ccadd9018c20379511e254efa98ed7d48fff9ba9eeb93b45a722cc1d2d61f51570cc57985d" | ||
| ] | ||
| } | ||
| x-commit-hash: "7017cc271403487756e412349f3718a8ba2e6a36" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| 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.9"} | ||
| "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) | ||
| ;; To easily change opam switches within a given Emacs session, you can | ||
| ;; install the minor mode https://github.com/ProofGeneral/opam-switch-mode | ||
| ;; and use one of its \"OPSW\" menus. | ||
| )) | ||
| 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.14-500/merlin-4.14-500.tbz" | ||
| checksum: [ | ||
| "sha256=ec23f324f875520cd8897f303cc6d4e595f3d7000914d410729f16b86ad1d70e" | ||
| "sha512=8db22100cc0af65b08f456a2a7af84e75396f5869ee7552f1f5888a1c0279d1d85e6eecb3a677ae6f0973a99823cddba0563843ce216197255667342ef161885" | ||
| ] | ||
| } | ||
| x-commit-hash: "be37d5589bc90c8ef10bb5bbd49108cd3b7dbe65" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| 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.1" & < "5.2"} | ||
| "dune" {>= "2.9.0"} | ||
| "merlin-lib" {= version} | ||
| "dot-merlin-reader" {>= "4.9"} | ||
| "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) | ||
| ;; To easily change opam switches within a given Emacs session, you can | ||
| ;; install the minor mode https://github.com/ProofGeneral/opam-switch-mode | ||
| ;; and use one of its \"OPSW\" menus. | ||
| )) | ||
| 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.14-501/merlin-4.14-501.tbz" | ||
| checksum: [ | ||
| "sha256=b7e9e96e924058c2ce429642788aa2e390720d441e224538bcf494a65203a292" | ||
| "sha512=734d760b1f73652bbd1d25736d08336c2df15f4eaa1d4c7aed345e83d1375b54266cb78dbeb698870a668633fbd2c7fece4dd161a50fba92f245dfad4b69c4c9" | ||
| ] | ||
| } | ||
| x-commit-hash: "7d7f525180f5979516e10c05d0cd49823edb5ef1" |