diff --git a/dap-chrome.el b/dap-chrome.el index a3f1643f..5636696e 100644 --- a/dap-chrome.el +++ b/dap-chrome.el @@ -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 diff --git a/dap-mode.el b/dap-mode.el index 77e20b08..8f9b0957 100644 --- a/dap-mode.el +++ b/dap-mode.el @@ -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)) @@ -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)