Fix some emulators not starting for new sdk debugger

Fixes #167

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+* Fix some emulators not starting for new sdk debugger. #167
+
+## 1.22.0
+
 * Change `lsp-dart-dap-vm-additional-args` from string to vector type following debugger server changes. #136
 * Check for dart related file extension during hot-reload/restart when auto-save enabled. #134
 * Run flutter proccess if not already running during hot-restart/hot-reload. #143

lsp-dart-dap.el

@@ -204,6 +204,7 @@ Required to support 'Inspect Widget'."
 ;; Flutter
 
 (declare-function all-the-icons-faicon "ext:all-the-icons")
+(declare-function all-the-icons-material "ext:all-the-icons")
 
 (defun lsp-dart-dap--device-label (id name is-device platform)
   "Return a friendly label for device with ID, NAME IS-DEVICE and PLATFORM.
@@ -219,6 +220,9 @@ Check for icons if supports it."
         (pcase platform
           ("web" (concat (all-the-icons-faicon "chrome" :face 'all-the-icons-blue :v-adjust 0.0) " " type-text " - " device-name))
           ("android" (concat (all-the-icons-faicon "android" :face 'all-the-icons-green  :v-adjust 0.0) " " type-text " - " device-name))
+          ("linux" (concat (all-the-icons-faicon "linux" :face 'all-the-icons-yellow  :v-adjust 0.0) " " type-text " - " device-name))
+          ("macos" (concat (all-the-icons-material "laptop_mac" :face 'all-the-icons-lsilver  :v-adjust 0.0) " " type-text " - " device-name))
+          ("windows" (concat (all-the-icons-faicon "windows" :face 'all-the-icons-blue  :v-adjust 0.0) " " type-text " - " device-name))
           ("ios" (concat (all-the-icons-faicon "apple" :face 'all-the-icons-lsilver :v-adjust 0.0) " " type-text " - " device-name))
           (_ default))
       default)))

lsp-dart-flutter-daemon.el

@@ -155,8 +155,8 @@ of this command."
      "device.getDevices"
      nil
      (-lambda (devices)
-       (if-let (emulator-running? (-first (-lambda ((&FlutterDaemonDevice :emulator-id?)) (string= emulator-id? id)) (append devices nil)))
-           (funcall callback device)
+       (if-let (emulator-running (-first (-lambda ((&FlutterDaemonDevice :emulator-id?)) (string= emulator-id? id)) (append devices nil)))
+           (funcall callback emulator-running)
          (-let* ((params (lsp-make-flutter-daemon-emulator-launch :emulator-id id)))
            (add-to-list 'lsp-dart-flutter-daemon-device-added-listeners
                         (cons id (list :callback callback)))