Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

`dap-start-debugging-noexpand': expand :cwd #414

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

`dap-start-debugging-noexpand': expand :cwd #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4c3974
`dap-start-debugging-noexpand': expand :cwd
nbfalcon Nov 26, 2020
6d699ab
`dap-start-debugging-noexpand': expanded :cwd
nbfalcon Nov 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dap-chrome.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
(setq conf (-> conf
(plist-put :type "chrome")
(plist-put :dap-server-path dap-chrome-debug-program)
(dap--put-if-absent :cwd (expand-file-name default-directory))))
(dap--put-if-absent :cwd default-directory)))
(dap--plist-delete
(pcase (plist-get conf :mode)
("url" (-> conf
Expand Down
23 changes: 13 additions & 10 deletions dap-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1590,7 +1590,7 @@ before starting the debug process."
:wait-for-port :type :request :port
:startup-function :environment-variables :hostName host) launch-args)
(session-name (dap--calculate-unique-name name (dap--get-sessions)))
(default-directory (or cwd default-directory))
(default-directory (expand-file-name (or cwd default-directory)))
(process-environment (if environment-variables
(cl-copy-list process-environment)
process-environment))
Expand Down Expand Up @@ -1622,15 +1622,18 @@ before starting the debug process."

(dap--set-sessions (cons debug-session debug-sessions)))
(dap--send-message
(dap--make-request request (-> launch-args
(cl-copy-list)
(dap--plist-delete :cleanup-function)
(dap--plist-delete :startup-function)
(dap--plist-delete :dap-server-path)
(dap--plist-delete :environment-variables)
(dap--plist-delete :wait-for-port)
(dap--plist-delete :skip-debug-session)
(dap--plist-delete :program-to-start)))
(dap--make-request request (cl-list*
:cwd default-directory
(-> launch-args
(cl-copy-list)
(dap--plist-delete :cwd)
(dap--plist-delete :cleanup-function)
(dap--plist-delete :startup-function)
(dap--plist-delete :dap-server-path)
(dap--plist-delete :environment-variables)
(dap--plist-delete :wait-for-port)
(dap--plist-delete :skip-debug-session)
(dap--plist-delete :program-to-start))))
(dap--session-init-resp-handler debug-session)
debug-session)))
debug-session)
Expand Down