From cdd39b20a5742ae975cbb57b2877a0aa7e8f74d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= Date: Tue, 16 Oct 2018 23:35:52 +0100 Subject: [PATCH] lang/ocaml: add merlin-eldoc type and doc on hover display MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This displays the type and documentation of thing under point and highlights occurrences automatically when idle. Could be achieved by appropriate use of keyboard shortcuts already set up by this module. However `merlin-eldoc` can also display the expected type of function call parameters, which merlin itself wouldn't. Signed-off-by: Edwin Török --- modules/lang/ocaml/config.el | 4 ++++ modules/lang/ocaml/packages.el | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/lang/ocaml/config.el b/modules/lang/ocaml/config.el index e25a7ff13..243ec5858 100644 --- a/modules/lang/ocaml/config.el +++ b/modules/lang/ocaml/config.el @@ -53,6 +53,10 @@ (add-hook 'merlin-mode-hook #'+ocaml|init-flycheck)) + (def-package! merlin-eldoc + :hook (merlin-mode . merlin-eldoc-setup)) + + (def-package! utop :when (featurep! :feature eval) :defer t ; loaded by hook below diff --git a/modules/lang/ocaml/packages.el b/modules/lang/ocaml/packages.el index 27af6197d..71128923f 100644 --- a/modules/lang/ocaml/packages.el +++ b/modules/lang/ocaml/packages.el @@ -3,6 +3,7 @@ (package! tuareg) (package! merlin) +(package! merlin-eldoc) (package! ocp-indent) (when (featurep! :feature syntax-checker)