Simplify

flutter.el

@@ -263,27 +263,20 @@ args."
    (display-buffer buffer)))
 
 (defun flutter-devices ()
-  "Return a list of devices in strings."
+  "Return an alist of devices in (name . ID) format."
   (let* ((output (shell-command-to-string "flutter devices --machine"))
-         (vec (json-read-from-string output))
-         (matches))
-    (mapc (lambda (alist)
-            (let-alist alist
-              (push .id matches)))
-          vec)
-    (reverse matches)))
+         (vec (json-read-from-string output)))
+    (mapcar
+     (lambda (alist) (let-alist alist (cons .name .id)))
+     vec)))
 
 ;;;###autoload
 (defun flutter-run-device (device-id)
   "Start `flutter run` with DEVICE-ID."
   (interactive
-   (list (completing-read
-          "Device ID: "
-          (lambda (string predicate action)
-            (if (eq action 'metadata)
-                `(metadata
-                  (display-sort-function . ,#'identity))
-              (complete-with-action action (flutter-devices) string predicate))))))
+   (list (let* ((collection (flutter-devices))
+                (choice (completing-read "Device: " collection)))
+           (cdr (assoc choice collection)))))
   (flutter-run (format "-d %s" device-id)))
 
 ;;;###autoload