From cdd5e3931fadd441da7289afd445028b98a5fae1 Mon Sep 17 00:00:00 2001 From: Felix Clark Date: Tue, 12 May 2020 10:19:15 -0400 Subject: [PATCH 1/3] activating dap web modules in TS mode --- modules/tools/debugger/config.el | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/tools/debugger/config.el b/modules/tools/debugger/config.el index f86585fdf..1c385f3d6 100644 --- a/modules/tools/debugger/config.el +++ b/modules/tools/debugger/config.el @@ -16,6 +16,14 @@ (realgud:trepanpl :modes (perl-mode perl6-mode)) (realgud:zshdb :modes (sh-mode)))) +(defun +debugger--load-dap-web () + "Load the DAP extensions for web development." + (require 'dap-node) + (require 'dap-chrome) + (require 'dap-firefox) + (when IS-WINDOWS + (require 'dap-edge)) + ) ;; ;;; Packages @@ -110,12 +118,9 @@ (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)))) + (with-eval-after-load 'js2-mode #'+debugger--load-dap-web) + (with-eval-after-load 'typescript-mode #'+debugger--load-dap-web) + ) (dap-mode 1)) From 7f201fc13e616bf04b0a130a6996c7f7fd0d322c Mon Sep 17 00:00:00 2001 From: Felix Clark Date: Tue, 12 May 2020 11:31:03 -0400 Subject: [PATCH 2/3] Following doom style guide --- modules/tools/debugger/config.el | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/tools/debugger/config.el b/modules/tools/debugger/config.el index 1c385f3d6..027148e75 100644 --- a/modules/tools/debugger/config.el +++ b/modules/tools/debugger/config.el @@ -16,14 +16,13 @@ (realgud:trepanpl :modes (perl-mode perl6-mode)) (realgud:zshdb :modes (sh-mode)))) -(defun +debugger--load-dap-web () +(defun +debugger--load-dap-web-h () "Load the DAP extensions for web development." (require 'dap-node) (require 'dap-chrome) (require 'dap-firefox) (when IS-WINDOWS - (require 'dap-edge)) - ) + (require 'dap-edge))) ;; ;;; Packages @@ -118,9 +117,8 @@ (mapc #'require (cddr module))))) (when (featurep! :lang javascript +lsp) - (with-eval-after-load 'js2-mode #'+debugger--load-dap-web) - (with-eval-after-load 'typescript-mode #'+debugger--load-dap-web) - ) + (with-eval-after-load 'js2-mode #'+debugger--load-dap-web-h) + (with-eval-after-load 'typescript-mode #'+debugger--load-dap-web-h)) (dap-mode 1)) From 95824c5054a767bf8075674b66eafe66f515489d Mon Sep 17 00:00:00 2001 From: Felix Clark Date: Thu, 14 May 2020 17:40:59 -0400 Subject: [PATCH 3/3] obviate helper function with after! --- modules/tools/debugger/config.el | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/modules/tools/debugger/config.el b/modules/tools/debugger/config.el index 027148e75..12e8eeda4 100644 --- a/modules/tools/debugger/config.el +++ b/modules/tools/debugger/config.el @@ -16,13 +16,6 @@ (realgud:trepanpl :modes (perl-mode perl6-mode)) (realgud:zshdb :modes (sh-mode)))) -(defun +debugger--load-dap-web-h () - "Load the DAP extensions for web development." - (require 'dap-node) - (require 'dap-chrome) - (require 'dap-firefox) - (when IS-WINDOWS - (require 'dap-edge))) ;; ;;; Packages @@ -117,8 +110,12 @@ (mapc #'require (cddr module))))) (when (featurep! :lang javascript +lsp) - (with-eval-after-load 'js2-mode #'+debugger--load-dap-web-h) - (with-eval-after-load 'typescript-mode #'+debugger--load-dap-web-h)) + (after! (:or js2-mode typescript-mode) + (require 'dap-node) + (require 'dap-chrome) + (require 'dap-firefox) + (when IS-WINDOWS + (require 'dap-edge)))) (dap-mode 1))