tools/debugger: move dap-mode behind +lsp flag
+ To make this consistent with other opt-in LSP integration + Install posframe for dap-ui-mode to work (#2934) Fixes #2934
This commit is contained in:
parent
a0fd06e96b
commit
09f617de8b
3 changed files with 42 additions and 40 deletions
|
@ -156,7 +156,7 @@ Modules that offer terminal emulation.
|
||||||
Small modules that give Emacs access to external tools & services.
|
Small modules that give Emacs access to external tools & services.
|
||||||
|
|
||||||
+ ansible - TODO
|
+ ansible - TODO
|
||||||
+ debugger - A (nigh-)universal debugger in Emacs
|
+ debugger =+lsp= - A (nigh-)universal debugger in Emacs
|
||||||
+ [[file:../modules/tools/direnv/README.org][direnv]] - TODO
|
+ [[file:../modules/tools/direnv/README.org][direnv]] - TODO
|
||||||
+ [[file:../modules/tools/docker/README.org][docker]] =+lsp= - TODO
|
+ [[file:../modules/tools/docker/README.org][docker]] =+lsp= - TODO
|
||||||
+ [[file:../modules/tools/editorconfig/README.org][editorconfig]] - TODO
|
+ [[file:../modules/tools/editorconfig/README.org][editorconfig]] - TODO
|
||||||
|
|
|
@ -25,43 +25,6 @@
|
||||||
gdb-many-windows t)
|
gdb-many-windows t)
|
||||||
|
|
||||||
|
|
||||||
(use-package! dap-mode
|
|
||||||
:when (featurep! :tools lsp)
|
|
||||||
:hook (dap-mode . dap-tooltip-mode)
|
|
||||||
:after lsp-mode
|
|
||||||
:demand t
|
|
||||||
:preface
|
|
||||||
(setq dap-breakpoints-file (concat doom-etc-dir "dap-breakpoints")
|
|
||||||
dap-utils-extension-path (concat doom-etc-dir "dap-extension/"))
|
|
||||||
:config
|
|
||||||
(dolist (module '(((:lang . cc) ccls dap-lldb dap-gdb-lldb)
|
|
||||||
((:lang . elixir) elixir-mode dap-elixir)
|
|
||||||
((:lang . go) go-mode dap-go)
|
|
||||||
((:lang . java) lsp-java dap-java)
|
|
||||||
((:lang . php) php-mode dap-php)
|
|
||||||
((:lang . python) python dap-python)
|
|
||||||
((:lang . ruby) ruby-mode dap-ruby)
|
|
||||||
((:lang . rust) rust-mode dap-lldb)))
|
|
||||||
(when (doom-module-p (caar module) (cdar module) '+lsp)
|
|
||||||
(with-eval-after-load (nth 1 module)
|
|
||||||
(mapc #'require (cddr module)))))
|
|
||||||
|
|
||||||
(when (featurep! :lang javascript +lsp)
|
|
||||||
(with-eval-after-load 'js2-mode
|
|
||||||
(require 'dap-node)
|
|
||||||
(require 'dap-chrome)
|
|
||||||
(require 'dap-firefox)
|
|
||||||
(when IS-WINDOWS
|
|
||||||
(require 'dap-edge))))
|
|
||||||
|
|
||||||
(dap-mode 1))
|
|
||||||
|
|
||||||
|
|
||||||
(use-package! dap-ui-mode
|
|
||||||
:hook (dap-mode . dap-ui-mode)
|
|
||||||
:hook (dap-ui-mode . dap-ui-controls-mode))
|
|
||||||
|
|
||||||
|
|
||||||
(use-package! realgud
|
(use-package! realgud
|
||||||
:defer t
|
:defer t
|
||||||
:init
|
:init
|
||||||
|
@ -123,3 +86,41 @@
|
||||||
(if cmd-buf (switch-to-buffer cmd-buf))
|
(if cmd-buf (switch-to-buffer cmd-buf))
|
||||||
(message "Error running command: %s" (mapconcat #'identity cmd-args " "))))
|
(message "Error running command: %s" (mapconcat #'identity cmd-args " "))))
|
||||||
cmd-buf)))
|
cmd-buf)))
|
||||||
|
|
||||||
|
|
||||||
|
(use-package! dap-mode
|
||||||
|
:when (featurep! +lsp)
|
||||||
|
:hook (dap-mode . dap-tooltip-mode)
|
||||||
|
:after lsp-mode
|
||||||
|
:demand t
|
||||||
|
:preface
|
||||||
|
(setq dap-breakpoints-file (concat doom-etc-dir "dap-breakpoints")
|
||||||
|
dap-utils-extension-path (concat doom-etc-dir "dap-extension/"))
|
||||||
|
:config
|
||||||
|
(dolist (module '(((:lang . cc) ccls dap-lldb dap-gdb-lldb)
|
||||||
|
((:lang . elixir) elixir-mode dap-elixir)
|
||||||
|
((:lang . go) go-mode dap-go)
|
||||||
|
((:lang . java) lsp-java dap-java)
|
||||||
|
((:lang . php) php-mode dap-php)
|
||||||
|
((:lang . python) python dap-python)
|
||||||
|
((:lang . ruby) ruby-mode dap-ruby)
|
||||||
|
((:lang . rust) rust-mode dap-lldb)))
|
||||||
|
(when (doom-module-p (caar module) (cdar module) '+lsp)
|
||||||
|
(with-eval-after-load (nth 1 module)
|
||||||
|
(mapc #'require (cddr module)))))
|
||||||
|
|
||||||
|
(when (featurep! :lang javascript +lsp)
|
||||||
|
(with-eval-after-load 'js2-mode
|
||||||
|
(require 'dap-node)
|
||||||
|
(require 'dap-chrome)
|
||||||
|
(require 'dap-firefox)
|
||||||
|
(when IS-WINDOWS
|
||||||
|
(require 'dap-edge))))
|
||||||
|
|
||||||
|
(dap-mode 1))
|
||||||
|
|
||||||
|
|
||||||
|
(use-package! dap-ui-mode
|
||||||
|
:when (featurep! +lsp)
|
||||||
|
:hook (dap-mode . dap-ui-mode)
|
||||||
|
:hook (dap-ui-mode . dap-ui-controls-mode))
|
||||||
|
|
|
@ -5,5 +5,6 @@
|
||||||
(when (featurep! :lang javascript)
|
(when (featurep! :lang javascript)
|
||||||
(package! realgud-trepan-ni :pin "6e9cac5e80")))
|
(package! realgud-trepan-ni :pin "6e9cac5e80")))
|
||||||
|
|
||||||
(when (featurep! :tools lsp)
|
(when (featurep! +lsp)
|
||||||
(package! dap-mode :pin "0b9c8f28ad"))
|
(package! dap-mode :pin "0b9c8f28ad")
|
||||||
|
(package! posframe :pin "e62e584268"))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue