From f6aa50e1bcd17cef3d7bd43b8b3cfd4760ae5c9e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 10 Oct 2020 13:48:54 -0400 Subject: [PATCH] Load dap-mode after lsp-mode manually :after complicates use-package load-order of its keywords, making it difficult for users to guess how to remove the dap-tooltip-mode :hook. We'll just do it ourselves. --- modules/tools/debugger/config.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/tools/debugger/config.el b/modules/tools/debugger/config.el index b0b1680b7..bccd09baf 100644 --- a/modules/tools/debugger/config.el +++ b/modules/tools/debugger/config.el @@ -105,11 +105,10 @@ (use-package! dap-mode :when (and (featurep! +lsp) (not (featurep! :tools lsp +eglot))) :hook (dap-mode . dap-tooltip-mode) - :after lsp-mode - :demand t - :preface + :init (setq dap-breakpoints-file (concat doom-etc-dir "dap-breakpoints") dap-utils-extension-path (concat doom-etc-dir "dap-extension/")) + (after! lsp-mode (require 'dap-mode)) :config (pcase-dolist (`((,category . ,modules) :after ,after :require ,libs) +debugger--dap-alist)