From a25c353d73b6087859f744c8c59b2a7ea168f202 Mon Sep 17 00:00:00 2001 From: brettlangdon Date: Thu, 17 Feb 2022 21:42:26 -0500 Subject: [PATCH] setup dap --- .gitignore | 1 + emacs.d/custom.el | 2 +- emacs.d/init.el | 21 +++++++++++++++++++++ emacs.d/layers/python/init.el | 14 ++------------ 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 0fdf27e..b5c08f6 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ emacs.d/forge-database.sqlite emacs.d/projects emacs.d/transient emacs.d/eln-cache +emacs.d/.dap-breakpoints diff --git a/emacs.d/custom.el b/emacs.d/custom.el index 50cff22..6a3a3cd 100644 --- a/emacs.d/custom.el +++ b/emacs.d/custom.el @@ -4,7 +4,7 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(package-selected-packages - '(lsp-pyright github-review forge magit clojure-mode py-isort flycheck lsp-python-ms helm-lsp go-mode company projectile helm adoc-mode csv-mode php-mode python-black cython-mode scss-mode vue-mode tide rust-mode company-auctex tex-site auctex sphinx-doc company-lsp lsp-ui lsp-mode ws-butler use-package smartparens pip-requirements osx-clipboard monokai-theme markdown-mode helm-projectile helm-ag godoctor go-guru go-eldoc go-autocomplete flycheck-gometalinter doom-modeline dockerfile-mode docker-compose-mode diminish company-go company-anaconda)) + '(dap-python dap-mode lsp-pyright github-review forge magit clojure-mode py-isort flycheck lsp-python-ms helm-lsp go-mode company projectile helm adoc-mode csv-mode php-mode python-black cython-mode scss-mode vue-mode tide rust-mode company-auctex tex-site auctex sphinx-doc company-lsp lsp-ui lsp-mode ws-butler use-package smartparens pip-requirements osx-clipboard monokai-theme markdown-mode helm-projectile helm-ag godoctor go-guru go-eldoc go-autocomplete flycheck-gometalinter doom-modeline dockerfile-mode docker-compose-mode diminish company-go company-anaconda)) '(safe-local-variable-values '((encoding . utf-8)))) (custom-set-faces ;; custom-set-faces was added by Custom. diff --git a/emacs.d/init.el b/emacs.d/init.el index cd742b5..14d7318 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -271,6 +271,27 @@ (setq lsp-enable-snippet nil) (setq read-process-output-max (* 1024 1024)) ;; 1MB (setq lsp-idle-delay 0.5)) + + (use-package lsp-ui + :commands lsp-ui-mode + :config + (setq lsp-ui-doc-enable nil) + (setq lsp-ui-doc-header t) + (setq lsp-ui-doc-include-signature t) + (setq lsp-ui-doc-border (face-foreground 'default)) + (setq lsp-ui-sideline-show-code-actions t) + (setq lsp-ui-sideline-delay 0.05)) + + (use-package helm-lsp + :commands helm-lsp-workspace-symbol) + + ;; dap-mode + (use-package dap-mode + :ensure t :after lsp-mode + :config + (dap-mode t) + (dap-ui-mode t)) + ) ;; -- Load layers -- diff --git a/emacs.d/layers/python/init.el b/emacs.d/layers/python/init.el index b5ff6da..83bf82d 100644 --- a/emacs.d/layers/python/init.el +++ b/emacs.d/layers/python/init.el @@ -5,18 +5,6 @@ :hook (python-mode . (lambda () (require 'lsp-pyright) (lsp)))) ; or lsp-deferred -(use-package lsp-ui - :commands lsp-ui-mode - :config - (setq lsp-ui-doc-enable nil) - (setq lsp-ui-doc-header t) - (setq lsp-ui-doc-include-signature t) - (setq lsp-ui-doc-border (face-foreground 'default)) - (setq lsp-ui-sideline-show-code-actions t) - (setq lsp-ui-sideline-delay 0.05)) - -(use-package helm-lsp - :commands helm-lsp-workspace-symbol) ;; Enable pip-requirements when editing a `requirements.txt` file (use-package pip-requirements @@ -48,3 +36,5 @@ ;; Enable Flycheck for python (enable-flycheck 'python-mode-hook) + +(require 'dap-python)