From 7b8832133fdc385a7d94231e9b890b614c701c2c Mon Sep 17 00:00:00 2001 From: Jason Held Date: Mon, 23 Sep 2024 15:37:04 -0400 Subject: [PATCH] lsp-dart-run error fix with using lsp-get on keys --- lsp-dart-dap.el | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/lsp-dart-dap.el b/lsp-dart-dap.el index 0a0b791..c4d7dd0 100644 --- a/lsp-dart-dap.el +++ b/lsp-dart-dap.el @@ -261,18 +261,22 @@ Call CALLBACK when the device is chosen and started successfully." (buffer-file-name)))))) (lambda (start-debugging-callback) (lsp-dart-dap--flutter-get-or-start-device - (-lambda ((&plist :id device-id :name device-name)) - (funcall start-debugging-callback - (-> pre-conf - (dap--put-if-absent :deviceId device-id) - (dap--put-if-absent :deviceName device-name) - (dap--put-if-absent :dap-server-path (if (lsp-dart-dap-use-sdk-debugger-p) - (append (lsp-dart-flutter-command) (list "debug_adapter" "-d" device-id)) - lsp-dart-dap-flutter-debugger-program)) - (dap--put-if-absent :flutterPlatform "default") - (dap--put-if-absent :toolArgs `("-d" ,device-id)) - (dap--put-if-absent :name (concat "Flutter (" device-name ")"))))))))) - + (lambda (device-params) + (let ((device-id (lsp-get device-params :id)) + (device-name (lsp-get device-params :name))) + + (funcall start-debugging-callback + (-> pre-conf + (dap--put-if-absent :deviceId device-id) + (dap--put-if-absent :deviceName device-name) + (dap--put-if-absent :dap-server-path (if (lsp-dart-dap-use-sdk-debugger-p) + (append (lsp-dart-flutter-command) (list "debug_adapter" "-d" device-id)) + lsp-dart-dap-flutter-debugger-program)) + (dap--put-if-absent :flutterPlatform "default") + (dap--put-if-absent :toolArgs `("-d" ,device-id)) + (dap--put-if-absent :name (concat "Flutter (" device-name ")")))) + )))))) + (dap-register-debug-provider "flutter" 'lsp-dart-dap--populate-flutter-start-file-args) (dap-register-debug-template "Flutter :: Debug" (list :type "flutter"))