Skip to content

Commit d2d1eb5

Browse files
committed
Support capabilities event
Also change the shape of current-capabilities to remove the body key and keep only the capabilities value.
1 parent f7b1b49 commit d2d1eb5

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

dap-mode.el

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
;; Author: Ivan Yonchovski <[email protected]>
1919
;; Keywords: languages, debug
2020
;; URL: https://github.com/emacs-lsp/dap-mode
21-
;; Package-Requires: ((emacs "26.1") (dash "2.18.0") (lsp-mode "6.0") (bui "1.1.0") (f "0.20.0") (s "1.12.0") (lsp-treemacs "0.1") (posframe "0.7.0"))
21+
;; Package-Requires: ((emacs "26.1") (dash "2.18.0") (lsp-mode "6.0") (bui "1.1.0") (f "0.20.0") (s "1.12.0") (lsp-treemacs "0.1") (posframe "0.7.0") (ht "2.3"))
2222
;; Version: 0.6
2323

2424
;;; Commentary:
@@ -34,6 +34,7 @@
3434
(require 'cl-lib)
3535
(require 'ansi-color)
3636
(require 'posframe)
37+
(require 'ht)
3738

3839
(require 'dap-launch)
3940

@@ -279,7 +280,7 @@ locations."
279280
;; the arguments that were used to start the debug session.
280281
(launch-args nil)
281282
;; Currently-available server capabilities
282-
(current-capabilities nil)
283+
(current-capabilities (make-hash-table :test 'equal))
283284
(error-message nil)
284285
(loaded-sources nil)
285286
(program-proc)
@@ -961,6 +962,9 @@ PARAMS are the event params.")
961962
(-let [(&hash "body" (&hash "source")) event]
962963
(cl-pushnew source (dap--debug-session-loaded-sources debug-session))
963964
(run-hook-with-args 'dap-loaded-sources-changed-hook debug-session)))
965+
("capabilities"
966+
(-let [(&hash "body" (&hash "capabilities")) event]
967+
(ht-update! (dap--debug-session-current-capabilities debug-session) capabilities)))
964968
(_ (dap-handle-event (intern event-type) debug-session body)))))
965969

966970
(defcustom dap-default-terminal-kind "integrated"
@@ -1236,7 +1240,6 @@ DEBUG-SESSION is the active debug session."
12361240
(dap--make-request "setExceptionBreakpoints"
12371241
(list :filters
12381242
(or (-some->> current-capabilities
1239-
(gethash "body")
12401243
(gethash "exceptionBreakpointFilters")
12411244
(-keep (-lambda ((&hash "default" "filter"))
12421245
(when (dap--breakpoint-filter-enabled filter type default)
@@ -1618,10 +1621,10 @@ before starting the debug process."
16181621
(dap--initialize-message type)
16191622
(dap--session-init-resp-handler
16201623
debug-session
1621-
(lambda (current-capabilities )
1624+
(-lambda ((&hash "body" capabilities))
16221625
(-let [debug-sessions (dap--get-sessions)]
16231626

1624-
(setf (dap--debug-session-current-capabilities debug-session) current-capabilities)
1627+
(ht-update! (dap--debug-session-current-capabilities debug-session) capabilities)
16251628

16261629
(dap--set-sessions (cons debug-session debug-sessions)))
16271630
(dap--send-message

dap-ui.el

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,6 @@ request."
10941094
(append
10951095
(when (dap--session-running debug-session)
10961096
(-some->> current-capabilities
1097-
(gethash "body")
10981097
(gethash "exceptionBreakpointFilters")
10991098
(-map (-lambda ((&hash "label" "filter" "default"))
11001099
(list :label (propertize

0 commit comments

Comments
 (0)