Skip to content

Commit 54c6dce

Browse files
authored
Merge pull request #225 from jheld/bugfix-flutter-run
Bugfix flutter run
2 parents 9ffbafb + 7b88321 commit 54c6dce

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

lsp-dart-dap.el

+16-12
Original file line numberDiff line numberDiff line change
@@ -261,18 +261,22 @@ Call CALLBACK when the device is chosen and started successfully."
261261
(buffer-file-name))))))
262262
(lambda (start-debugging-callback)
263263
(lsp-dart-dap--flutter-get-or-start-device
264-
(-lambda ((&hash "id" device-id "name" device-name))
265-
(funcall start-debugging-callback
266-
(-> pre-conf
267-
(dap--put-if-absent :deviceId device-id)
268-
(dap--put-if-absent :deviceName device-name)
269-
(dap--put-if-absent :dap-server-path (if (lsp-dart-dap-use-sdk-debugger-p)
270-
(append (lsp-dart-flutter-command) (list "debug_adapter" "-d" device-id))
271-
lsp-dart-dap-flutter-debugger-program))
272-
(dap--put-if-absent :flutterPlatform "default")
273-
(dap--put-if-absent :toolArgs `("-d" ,device-id))
274-
(dap--put-if-absent :name (concat "Flutter (" device-name ")")))))))))
275-
264+
(lambda (device-params)
265+
(let ((device-id (lsp-get device-params :id))
266+
(device-name (lsp-get device-params :name)))
267+
268+
(funcall start-debugging-callback
269+
(-> pre-conf
270+
(dap--put-if-absent :deviceId device-id)
271+
(dap--put-if-absent :deviceName device-name)
272+
(dap--put-if-absent :dap-server-path (if (lsp-dart-dap-use-sdk-debugger-p)
273+
(append (lsp-dart-flutter-command) (list "debug_adapter" "-d" device-id))
274+
lsp-dart-dap-flutter-debugger-program))
275+
(dap--put-if-absent :flutterPlatform "default")
276+
(dap--put-if-absent :toolArgs `("-d" ,device-id))
277+
(dap--put-if-absent :name (concat "Flutter (" device-name ")"))))
278+
))))))
279+
276280
(dap-register-debug-provider "flutter" 'lsp-dart-dap--populate-flutter-start-file-args)
277281
(dap-register-debug-template "Flutter :: Debug"
278282
(list :type "flutter"))

0 commit comments

Comments
 (0)