Finish support for choose an emulator

ericdallo · ericdallo · commit 7fcc20487ff7 · 2020-04-30T00:31:43.000-03:00
diff --git a/lsp-dart-dap.el b/lsp-dart-dap.el
@@ -145,37 +145,53 @@ Required to support 'Inspect Widget'."
 
 ;; Flutter
 
-(defun lsp-dart-dap--flutter-get-or-create-device ()
-  "Return the device to debug or prompt to start it."
-  (-let* ((devices (lsp-dart-flutter-daemon-get-emulators))
-          (chosen-device (dap--completing-read "Select a device to use: "
-                                               devices
-                                               (-lambda ((&hash "id" "name" "category" "platformType" platform))
-                                                 (format "%s - %s" platform (if name name id)))
-                                               nil
-                                               t))
-          (emulator (lsp-dart-flutter-daemon-launch chosen-device)))
-    (ht ('id "emulator-5554")
-        ('name "device"))
-    ))
+(declare-function all-the-icons-faicon "ext:all-the-icons")
+
+(defun lsp-dart-dap--device-label (id name platform)
+  "Return a friendly label for device with ID, NAME and PLATFORM.
+Check for icons if supports it."
+  (let* ((device-name (if name name id))
+         (default (concat platform " - " device-name)))
+    (if (featurep 'all-the-icons)
+        (pcase platform
+          ("android" (concat (all-the-icons-faicon "android" :face 'all-the-icons-green) " " device-name))
+          ("ios" (concat (all-the-icons-faicon "apple" :face 'all-the-icons-lsilver) " " device-name))
+          (_ default))
+      default)))
+
+(defun lsp-dart-dap--flutter-get-or-create-device (callback)
+  "Return the device to debug or prompt to start it.
+Call CALLBACK when the device is chosen and started successfully."
+  (lsp-dart-flutter-daemon-get-emulators
+   (lambda (devices)
+     (-let* ((chosen-device (dap--completing-read "Select a device to use: "
+                                                  devices
+                                                  (-lambda ((&hash "id" "name" "platformType" platform))
+                                                    (lsp-dart-dap--device-label id name platform))
+                                                  nil
+                                                  t)))
+       (lsp-dart-flutter-daemon-launch chosen-device callback)))))
 
 (defun lsp-dart-dap--populate-flutter-start-file-args (conf)
   "Populate CONF with the required arguments for Flutter debug."
-  (-let* ((root (lsp-dart-project-get-root))
-          ((&hash "id" device-id "name" device-name) (lsp-dart-dap--flutter-get-or-create-device)))
-    (-> conf
-        (dap--put-if-absent :dap-server-path lsp-dart-dap-flutter-debugger-program)
-        (dap--put-if-absent :cwd root)
-        (dap--put-if-absent :program (lsp-dart-project-get-entrypoint))
-        (dap--put-if-absent :dartPath (lsp-dart-project-dart-command))
-        (dap--put-if-absent :flutterPath (lsp-dart-project-get-flutter-path))
-        (dap--put-if-absent :flutterTrackWidgetCreation lsp-dart-dap-flutter-track-widget-creation)
-        (dap--put-if-absent :useFlutterStructuredErrors lsp-dart-dap-flutter-structured-errors)
-        (dap--put-if-absent :debugExternalLibraries lsp-dart-dap-debug-external-libraries)
-        (dap--put-if-absent :debugSdkLibraries lsp-dart-dap-debug-sdk-libraries)
-        (dap--put-if-absent :deviceId device-id)
-        (dap--put-if-absent :deviceName device-name)
-        (dap--put-if-absent :name (concat "Flutter (" device-name ")")))))
+  (let ((pre-conf (-> conf
+                      (dap--put-if-absent :dap-server-path lsp-dart-dap-flutter-debugger-program)
+                      (dap--put-if-absent :cwd (lsp-dart-project-get-root))
+                      (dap--put-if-absent :program (lsp-dart-project-get-entrypoint))
+                      (dap--put-if-absent :dartPath (lsp-dart-project-dart-command))
+                      (dap--put-if-absent :flutterPath (lsp-dart-project-get-flutter-path))
+                      (dap--put-if-absent :flutterTrackWidgetCreation lsp-dart-dap-flutter-track-widget-creation)
+                      (dap--put-if-absent :useFlutterStructuredErrors lsp-dart-dap-flutter-structured-errors)
+                      (dap--put-if-absent :debugExternalLibraries lsp-dart-dap-debug-external-libraries)
+                      (dap--put-if-absent :debugSdkLibraries lsp-dart-dap-debug-sdk-libraries))))
+    (lambda (start-debugging-callback)
+      (lsp-dart-dap--flutter-get-or-create-device
+       (-lambda ((&hash "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 :name (concat "Flutter (" device-name ")")))))))))
 
 (dap-register-debug-provider "flutter" 'lsp-dart-dap--populate-flutter-start-file-args)
 (dap-register-debug-template "Flutter :: Debug"
@@ -186,6 +202,21 @@ Required to support 'Inspect Widget'."
                                    :name "Flutter"))
 
 (defvar lsp-dart-dap--flutter-progress-reporter nil)
+(defvar lsp-dart-dap--flutter-progress-reporter-timer nil)
+
+(defun lsp-dart-dap--flutter-progress-timer-cancel (_debug-session)
+  "Cancel the Flutter progress timer for DEBUG-SESSION."
+  (setq lsp-dart-dap--flutter-progress-reporter nil)
+  (setq lsp-dart-dap--flutter-progress-reporter-timer nil)
+  (when lsp-dart-dap--flutter-progress-reporter-timer
+    (cancel-timer lsp-dart-dap--flutter-progress-reporter-timer))
+
+  (add-hook 'dap-terminated-hook #'lsp-dart-dap--flutter-progress-timer-cancel)
+
+  (defun lsp-dart-dap--flutter-progress-update ()
+    "Update the flutter progress reporter."
+    (when lsp-dart-dap--flutter-progress-reporter
+      (progress-reporter-update lsp-dart-dap--flutter-progress-reporter))))
 
 (cl-defmethod dap-handle-event ((_event (eql dart.log)) _session params)
   "Handle debugger uris EVENT for SESSION with PARAMS."
@@ -201,7 +232,9 @@ Required to support 'Inspect Widget'."
                          (propertize "[DAP] "
                                      'face 'font-lock-function-name-face))))
     (setq lsp-dart-dap--flutter-progress-reporter
-          (make-progress-reporter (concat prefix (gethash "message" params))))))
+          (make-progress-reporter (concat prefix (gethash "message" params))))
+    (setq lsp-dart-dap--flutter-progress-reporter-timer
+          (run-with-timer 0.2 0.2 #'lsp-dart-dap--flutter-progress-update))))
 
 (cl-defmethod dap-handle-event ((_event (eql dart.launched)) _session _params)
   "Handle debugger uris EVENT for SESSION with PARAMS."
@@ -221,7 +254,7 @@ Required to support 'Inspect Widget'."
 
 (cl-defmethod dap-handle-event ((_event (eql dart.flutter.firstFrame)) _session _params)
   "Handle debugger uris EVENT for SESSION with PARAMS."
-  (setq lsp-dart-dap--flutter-progress-reporter nil)
+  (lsp-dart-dap--flutter-progress-timer-cancel (dap--cur-session))
   (lsp-dart-dap-log "App ready!"))
 
 (cl-defmethod dap-handle-event ((_event (eql dart.serviceRegistered)) _session _params)
diff --git a/lsp-dart-flutter-daemon.el b/lsp-dart-flutter-daemon.el
@@ -2,7 +2,7 @@
 ;;
 ;; Version: 1.8
 ;; Keywords: languages, extensions
-;; Package-Requires: ((emacs "25.2") (lsp-mode "6.0"))
+;; Package-Requires: ((emacs "25.2") (lsp-mode "6.0") (dash "2.14.1"))
 ;; URL: https://github.com/emacs-lsp/lsp-dart.el
 ;;
 ;; This program is free software; you can redistribute it and/or modify
@@ -25,13 +25,26 @@
 ;;; Code:
 
 (require 'comint)
+(require 'dash)
+(require 'ht)
 (require 'lsp-mode)
 
 (require 'lsp-dart-project)
 
 (defconst lsp-dart-flutter-daemon-buffer-name "*LSP Dart - Flutter daemon*")
 (defconst lsp-dart-flutter-daemon-name "LSP Dart - Flutter daemon")
 
+(defvar lsp-dart-flutter-daemon-current-command nil)
+(defvar lsp-dart-flutter-daemon-current-device nil)
+
+(defun lsp-dart-flutter-daemon-log (level msg &rest args)
+  "Log for LEVEL, MSG with ARGS adding lsp-dart-flutter-daemon prefix."
+  (lsp-dart-project-log (concat
+                         (propertize (concat "[FLUTTER " (upcase level) "] ")
+                                     'face 'font-lock-function-name-face)
+                         msg
+                         args)))
+
 (defun lsp-dart-flutter-daemon--generate-command-id ()
   "Generate a random command id."
   (random 10000))
@@ -57,50 +70,80 @@ PARAMS is the optional method params."
             (lsp--json-serialize command)
             "]\n")))
 
-(defvar lsp-dart-flutter-daemon-response nil)
-
-(defun lsp-dart-flutter-daemon-handle-response (id event-name response)
-  "Handle RESPONSE and save if it is for ID.
-Wait for next response if EVENT-NAME is non null."
-  (when (string-prefix-p "[" response)
-    (-let* (((&hash "id" resp-id "result" "event" "params") (lsp--read-json (substring response 1 -2))))
-      (if event-name
-          (when (string= event event-name)
-            (setq lsp-dart-flutter-daemon-response params))
+(defun lsp-dart-flutter-daemon-raw->response (response)
+  "Parse raw RESPONSE into a list of responses."
+  (when (string-prefix-p "[" (string-trim response))
+    (--> response
+         string-trim
+         (replace-regexp-in-string (regexp-quote "\n") "" it nil 'literal)
+         (replace-regexp-in-string (regexp-quote "][") "]\n[" it nil 'literal)
+         (split-string it "\n")
+         (-map (lambda (el) (seq-first (lsp--read-json el))) it))))
+
+(defun lsp-dart-flutter-daemon-handle-events (raw-response)
+  "Handle Flutter daemon events from RAW-RESPONSE."
+  (-map (-lambda ((&hash "event" "params" (params &as &hash? "level" "message")))
+          (when event
+            (pcase event
+              ("device.removed" (setq lsp-dart-flutter-daemon-current-device nil))
+
+              ("device.added" (setq lsp-dart-flutter-daemon-current-device params))
+
+              ("daemon.logMessage" (lsp-dart-flutter-daemon-log level message)))))
+        (lsp-dart-flutter-daemon-raw->response raw-response)))
+
+(defun lsp-dart-flutter-daemon-handle-response (raw-response)
+  "Handle the RAW-RESPONSE from comint output."
+  (when lsp-dart-flutter-daemon-current-command
+    (--map
+      (-let* (((&hash "id" resp-id "result" "event" "params") it)
+              ((&hash "id" "callback" "event-name") lsp-dart-flutter-daemon-current-command))
+        (if event-name
+            (when (string= event event-name)
+              (remove-hook 'comint-output-filter-functions #'lsp-dart-flutter-daemon-handle-response)
+              (funcall callback params))
           (when (= resp-id id)
-            (setq lsp-dart-flutter-daemon-response result))))))
+            (remove-hook 'comint-output-filter-functions #'lsp-dart-flutter-daemon-handle-response)
+            (if result
+                (funcall callback result)
+              (funcall callback)))))
+      (lsp-dart-flutter-daemon-raw->response raw-response))))
 
 (defun lsp-dart-flutter-daemon-running-p ()
   "Return non-nil if the Flutter daemon is already running."
   (comint-check-proc lsp-dart-flutter-daemon-buffer-name))
 
-(defun lsp-dart-flutter-daemon--send (method &optional params event-name)
-  "Send a command with METHOD to a Flutter daemon and await for a response.
+(defun lsp-dart-flutter-daemon--send (method callback &optional params event-name)
+  "Send a command with METHOD to the daemon and call CALLBACK with the response.
 PARAMS is the optional method args and should be a hash-table.
 If EVENT-NAME is non-nil, it will this event to return its value.
 Starts the daemon if is not running yet."
   (unless (lsp-dart-flutter-daemon-running-p)
     (lsp-dart-flutter-daemon--start))
-  (setq lsp-dart-flutter-daemon-response nil)
   (let* ((id (lsp-dart-flutter-daemon--generate-command-id))
          (command (lsp-dart-flutter-daemon--build-command id method params)))
-    (remove-hook 'comint-output-filter-functions (-partial #'lsp-dart-flutter-daemon-handle-response id event-name) t)
-    (add-hook 'comint-output-filter-functions (-partial #'lsp-dart-flutter-daemon-handle-response id event-name))
-    (comint-send-string (get-buffer-process lsp-dart-flutter-daemon-buffer-name) command)
-    (while (not lsp-dart-flutter-daemon-response)
-      (sit-for 0.1))
-    lsp-dart-flutter-daemon-response))
-
-(defun lsp-dart-flutter-daemon-get-emulators ()
-  "Return the available emulators from Flutter daemon."
-  (lsp-dart-flutter-daemon--send "emulator.getEmulators"))
-
-(defun lsp-dart-flutter-daemon-launch (device)
-  "Launch emulator for DEVICE and wait for connected state."
-  (-let* (((&hash "id") device)
-          (params (ht ('emulatorId id))))
-    (lsp-dart-flutter-daemon--send "device.enable")
-    (lsp-dart-flutter-daemon--send "emulator.launch" params "device.added")))
+    (setq lsp-dart-flutter-daemon-current-command (ht ("id" id)
+                                                      ("callback" callback)
+                                                      ("event-name" event-name)))
+    (add-hook 'comint-output-filter-functions #'lsp-dart-flutter-daemon-handle-response)
+    (comint-send-string (get-buffer-process lsp-dart-flutter-daemon-buffer-name) command)))
+
+(defun lsp-dart-flutter-daemon-get-emulators (callback)
+  "Call CALLBACK with the available emulators from Flutter daemon."
+  (lsp-dart-flutter-daemon--send "emulator.getEmulators" callback))
+
+(defun lsp-dart-flutter-daemon-launch (device callback)
+  "Launch emulator for DEVICE and wait for connected state and call CALLBACK."
+  (if lsp-dart-flutter-daemon-current-device
+      (funcall callback lsp-dart-flutter-daemon-current-device)
+    (-let* (((&hash "id") device)
+            (params (ht ("emulatorId" id))))
+      (lsp-dart-flutter-daemon--send
+       "device.enable"
+       (lambda ()
+         (remove-hook 'comint-output-filter-functions #'lsp-dart-flutter-daemon-handle-events)
+         (add-hook 'comint-output-filter-functions #'lsp-dart-flutter-daemon-handle-events)
+         (lsp-dart-flutter-daemon--send "emulator.launch" callback params "device.added"))))))
 
 ;;;###autoload
 (define-derived-mode lsp-dart-flutter-daemon-mode comint-mode lsp-dart-flutter-daemon-name
