Merge pull request #57 from emacs-lsp/refactor-tests

Refactor tests output

Author: ericdallo

README.md

@@ -184,6 +184,7 @@ lsp-dart supports running Flutter and Dart commands as following:
 | `lsp-dart-flutter-outline-position-params`       | The Flutter outline tree position params                                                                                                                                             | Left side         |
 | `lsp-dart-flutter-fringe-colors`                 | Enable the Flutter colors on fringe.                                                                                                                                                 | `t`               |
 | `lsp-dart-flutter-widget-guides`                 | Enable the Flutter widget guide lines from parent to child widgets                                                                                                                   | `t`               |
+| `lsp-dart-test-pop-to-buffer-on-run`             | Whether to pop to tests buffer on run, only display or do nothing.                                                                                                                   | `display-only`    |
 | `lsp-dart-main-code-lens`                        | Enable the `Run\|Debug` code lens on main methods.                                                                                                                                   | `t`               |
 | `lsp-dart-test-code-lens`                        | Enable the `Run\|Debug` code lens on tests.                                                                                                                                          | `t`               |
 | `lsp-dart-dap-extension-version`                 | The debugger extension version.                                                                                                                                                      | 3.10.1            |

lsp-dart-code-lens.el

@@ -141,10 +141,10 @@ RANGE is the overlay range to build."
                            (line-beginning-position)))
           (spaces (make-string beg-position ?\s))
           (overlay (make-overlay beg-line end buffer))
-          (test (make-lsp-dart-test :file-name (buffer-file-name buffer)
-                                    :names names
-                                    :position beg
-                                    :kind kind))
+          (test (make-lsp-dart-test-len :file-name (buffer-file-name buffer)
+                                        :names names
+                                        :position beg
+                                        :kind kind))
           (separator (propertize " " 'font-lock-face 'lsp-dart-code-lens-separator)))
     (overlay-put overlay 'lsp-dart-test-code-lens t)
     (overlay-put overlay 'lsp-dart-test test)

lsp-dart-flutter-daemon.el

@@ -59,11 +59,10 @@
       (make-comint-in-buffer lsp-dart-flutter-daemon-name buffer (lsp-dart-flutter-command) nil "daemon")
       (with-current-buffer buffer
         (unless (derived-mode-p 'lsp-dart-flutter-daemon-mode)
-          (lsp-dart-flutter-daemon-mode)))
-      (remove-hook 'comint-output-filter-functions #'lsp-dart-flutter-daemon--handle-responses)
-      (remove-hook 'dap-terminated-hook #'lsp-dart-flutter-daemon--reset-current-device)
-      (add-hook 'comint-output-filter-functions #'lsp-dart-flutter-daemon--handle-responses)
-      (add-hook 'dap-terminated-hook #'lsp-dart-flutter-daemon--reset-current-device)
+          (lsp-dart-flutter-daemon-mode))
+        (remove-hook 'dap-terminated-hook #'lsp-dart-flutter-daemon--reset-current-device t)
+        (add-hook 'dap-terminated-hook #'lsp-dart-flutter-daemon--reset-current-device nil t)
+        (setq-local comint-output-filter-functions #'lsp-dart-flutter-daemon--handle-responses))
       (lsp-dart-flutter-daemon--send "device.enable"))))
 
 (defun lsp-dart-flutter-daemon--build-command (id method &optional params)

lsp-dart-protocol.el

@@ -53,5 +53,21 @@
  (FlutterDaemonDevice (:id :name :platform :category :platformType :ephemeral :emulator) (:isDevice))
  (FlutterDaemonEmulatorLaunch (:emulatorId)))
 
+(lsp-interface
+ (Notification (:type :time) nil)
+ (StartNotification (:type :time :protocolVersion) (:runnerVersion))
+ (AllSuitesNotification (:type :time :count) nil)
+ (SuiteNotification (:type :time :suite) nil)
+ (Suite (:id :platform :path) nil)
+ (Test (:id :suiteID :groupIDs) (:name :line :column :url :root_line :root_column :root_url))
+ (TestNotification (:type :time :test) nil)
+ (Group (:testCount) (:parentID))
+ (GroupNotification (:type :time :group) nil)
+ (TestStartNotification (:type :time :test) nil)
+ (TestDoneNotification (:type :time :testID :result :skipped :hidden) nil)
+ (DoneNotification (:type :time :success) nil)
+ (PrintNotification (:type :time :testID :messageType :message) nil)
+ (ErrorNotification (:type :time :testID :error :stackTrace :isFailure) nil))
+
 (provide 'lsp-dart-protocol)
 ;;; lsp-dart-protocol.el ends here