Skip to content

Commit 81d3dbf

Browse files
committed
dap-python: allow the :debugger key to be a string
1 parent 29d0c87 commit 81d3dbf

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

dap-python.el

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,10 @@ https://github.com/pyenv/pyenv-which-ext."
185185

186186
(defcustom dap-python-debugger 'ptvsd
187187
"Specify which debugger to use for `dap-python'.
188-
Can be either 'ptvsd or 'debugpy. Note that this setting can be
189-
overriden in individual `dap-python' launch configurations."
188+
Can be either `ptvsd' or `debugpy.' Note that this setting can be
189+
overridden in individual `dap-python' launch configuration. The
190+
values of this variable or the :debugger field may also be
191+
strings, for the sake of launch.json feature parity."
190192
:type '(choice (const 'ptvsd) (const 'debugpy))
191193
:group 'dap-python)
192194

@@ -201,7 +203,7 @@ overriden in individual `dap-python' launch configurations."
201203
(debugger (plist-get conf :debugger)))
202204
(cl-remf conf :debugger)
203205
(pcase (or debugger dap-python-debugger)
204-
('ptvsd
206+
((or 'ptvsd "ptvsd")
205207
(let ((host "localhost")
206208
(debug-port (dap--find-available-port)))
207209
;; support :args ["foo" "bar"]; NOTE: :args can be nil; however, nil is
@@ -221,7 +223,7 @@ overriden in individual `dap-python' launch configurations."
221223
(plist-put conf :port debug-port)
222224
(plist-put conf :hostName host)
223225
(plist-put conf :host host)))
224-
('debugpy
226+
((or 'debugpy "debugpy")
225227
;; If certain properties are nil, issues will arise, as debugpy expects
226228
;; them to unspecified instead. Some templates in this file set such
227229
;; properties (e.g. :module) to nil instead of leaving them undefined. To

0 commit comments

Comments
 (0)