Fix some dart commands not working after dart sdk 2.16.0

Author: ericdallo

CHANGELOG.md

@@ -6,6 +6,7 @@
 * Fix duplicated logs on old debugger. #154
 * Fix `lsp-dart-run` for dart only files. #168
 * Fix test tree when debugging dart/flutter tests.
+* Fix some dart commands not working after dart sdk 2.16.0.
 
 ## 1.22.0
 

lsp-dart-commands.el

@@ -28,7 +28,7 @@
 (defun lsp-dart--run-command (command args)
   "Run COMMAND with ARGS from the project root."
   (lsp-dart-from-project-root
-   (compilation-start (format "%s %s" command args)
+   (compilation-start (format "%s %s" (string-join command " ") args)
                       t
                       (lambda (_) lsp-dart-commands-buffer-name))))
 

lsp-dart-dap.el

@@ -261,7 +261,7 @@ Call CALLBACK when the device is chosen and started successfully."
                       (dap--put-if-absent :deviceId device-id)
                       (dap--put-if-absent :deviceName device-name)
                       (dap--put-if-absent :dap-server-path (if (lsp-dart-dap-use-sdk-debugger-p)
-                                                               `(,(lsp-dart-flutter-command) "debug_adapter" "-d" ,device-id)
+                                                               (append (lsp-dart-flutter-command) (list "debug_adapter" "-d" device-id))
                                                              lsp-dart-dap-flutter-debugger-program))
                       (dap--put-if-absent :flutterPlatform "default")
                       (dap--put-if-absent :toolArgs `("-d" ,device-id))
@@ -453,7 +453,7 @@ Run program PATH if not nil passing ARGS if not nil."
   (-> (list :name "Flutter Tests"
             :type "flutter"
             :dap-server-path (if (lsp-dart-dap-use-sdk-debugger-p)
-                                 `(,(lsp-dart-flutter-command) "debug_adapter" "--test")
+                                 (append (lsp-dart-flutter-command) '("debug_adapter" "--test"))
                                lsp-dart-dap-flutter-test-debugger-program)
             :program path
             :noDebug nil

lsp-dart-flutter-daemon.el

@@ -53,8 +53,9 @@
 (defun lsp-dart-flutter-daemon-start ()
   "Start the Flutter daemon."
   (unless (lsp-dart-flutter-daemon--running-p)
-    (let ((buffer (get-buffer-create lsp-dart-flutter-daemon-buffer-name)))
-      (make-comint-in-buffer lsp-dart-flutter-daemon-name buffer (lsp-dart-flutter-command) nil "daemon")
+    (let ((buffer (get-buffer-create lsp-dart-flutter-daemon-buffer-name))
+          (command (lsp-dart-flutter-command)))
+      (make-comint-in-buffer lsp-dart-flutter-daemon-name buffer (car command) nil (append (cdr command) '("daemon")))
       (with-current-buffer buffer
         (unless (derived-mode-p 'lsp-dart-flutter-daemon-mode)
           (lsp-dart-flutter-daemon-mode))
@@ -167,7 +168,7 @@ of this command."
   "Major mode for `lsp-dart-flutter-daemon-start`."
   (setq comint-prompt-read-only nil)
   (setq comint-process-echoes nil)
-  (setenv "PATH" (concat (lsp-dart-flutter-command) ":" (getenv "PATH"))))
+  (setenv "PATH" (concat (car (lsp-dart-flutter-command)) ":" (getenv "PATH"))))
 
 (provide 'lsp-dart-flutter-daemon)
 ;;; lsp-dart-flutter-daemon.el ends here

lsp-dart-test-support.el

@@ -123,8 +123,8 @@ NOTIFICATION is the event notification.")
   "Handle testStart NOTIFICATION."
   (-let (((&TestStartNotification :time :test (&Test :id :name?)) notification))
     (lsp-dart-test--set-running-test id (make-lsp-dart-running-test :id id
-                                                    :name name?
-                                                    :start-time time))
+                                                                    :name name?
+                                                                    :start-time time))
     (run-hook-with-args 'lsp-dart-test-start-notification-hook notification)))
 
 (cl-defmethod lsp-dart-test--handle-notification ((_event (eql allSuites)) _notification)
@@ -186,7 +186,7 @@ NOTIFICATION is the event notification.")
       (setq-local default-directory (or project-rt default-directory))
       (unless (derived-mode-p 'lsp-dart-test-process-mode)
         (lsp-dart-test-process-mode))
-      (apply #'make-comint-in-buffer lsp-dart-test--process-buffer-name process-buffer command nil args))))
+      (apply #'make-comint-in-buffer lsp-dart-test--process-buffer-name process-buffer (car command) nil (append (cdr command) args)))))
 
 (defun lsp-dart-test--run (&optional test)
   "Run Dart/Flutter test command in a compilation buffer.
@@ -211,7 +211,7 @@ to run otherwise run all tests from file-name in TEST."
                                         (lsp-dart-assoc-if test-arg "--name")
                                         (lsp-dart-assoc-if test-arg test-arg)
                                         (append (list test-file)))))
-  (lsp-dart-test--run-process (lsp-dart-test--build-command) (lsp-dart-test--build-command-extra-args)))
+    (lsp-dart-test--run-process (lsp-dart-test--build-command) (lsp-dart-test--build-command-extra-args)))
   (run-hooks 'lsp-dart-test-run-started-hook))
 
 (defun lsp-dart-test--debug (test)
@@ -362,8 +362,8 @@ NAMES arg is optional and are the group of tests representing a test name."
   (setq comint-process-echoes nil)
   (setq process-connection-type nil)
   (if (lsp-dart-flutter-project-p)
-      (setenv "PATH" (concat (lsp-dart-flutter-command) ":" (getenv "PATH")))
-    (setenv "PATH" (concat (lsp-dart-pub-command) ":" (getenv "PATH"))))
+      (setenv "PATH" (concat (car (lsp-dart-flutter-command)) ":" (getenv "PATH")))
+    (setenv "PATH" (concat (car (lsp-dart-pub-command)) ":" (getenv "PATH"))))
   (setq-local comint-output-filter-functions #'lsp-dart-test--handle-process-response))
 
 (define-minor-mode lsp-dart-test-mode

lsp-dart-utils.el

@@ -135,16 +135,6 @@ FLUTTER_ROOT environment variable."
         file-truename)
       (getenv "FLUTTER_ROOT")))
 
-(defun lsp-dart-pub-command ()
-  "Return the pub executable path from Dart SDK path."
-  (if (eq system-type 'windows-nt)
-      (expand-file-name "bin/pub.bat" (lsp-dart-get-sdk-dir)))
-  (expand-file-name "bin/pub" (lsp-dart-get-sdk-dir)))
-
-(defun lsp-dart-pub-snapshot-command ()
-  "Return the pub snapshot executable path from Dart SDK path."
-  (expand-file-name "bin/snapshots/pub.dart.snapshot" (lsp-dart-get-sdk-dir)))
-
 (defun lsp-dart-dart-command ()
   "Return the dart executable from Dart SDK dir."
   (let* ((executable-path (if (eq system-type 'windows-nt) "bin/dart.bat" "bin/dart"))
@@ -153,14 +143,26 @@ FLUTTER_ROOT environment variable."
         command
       (lsp-dart-log "Dart command not found in path '%s'" command))))
 
+(defun lsp-dart-pub-command ()
+  "Return the pub executable path from Dart SDK path."
+  (if (lsp-dart-version-at-least-p "2.16.0")
+      (list (lsp-dart-dart-command) "pub")
+    (if (eq system-type 'windows-nt)
+        (list (expand-file-name "bin/pub.bat" (lsp-dart-get-sdk-dir)))
+      (list (expand-file-name "bin/pub" (lsp-dart-get-sdk-dir))))))
+
+(defun lsp-dart-pub-snapshot-command ()
+  "Return the pub snapshot executable path from Dart SDK path."
+  (expand-file-name "bin/snapshots/pub.dart.snapshot" (lsp-dart-get-sdk-dir)))
+
 (defun lsp-dart-flutter-command ()
   "Return the flutter executable from Flutter SDK dir."
   (let* ((executable-path (if (eq system-type 'windows-nt)
                               "bin/flutter.bat"
                             (concat "bin/" lsp-dart-flutter-executable)))
          (command (expand-file-name executable-path (lsp-dart-get-flutter-sdk-dir))))
     (if (file-exists-p command)
-        command
+        (list command)
       (lsp-dart-log "Flutter command not found in path '%s'" command))))
 
 
@@ -229,7 +231,7 @@ FLUTTER_ROOT environment variable."
 
 (defun lsp-dart-get-full-flutter-version ()
   "Retrieve the Flutter version from shell command."
-  (->> (concat (lsp-dart-flutter-command) " --version")
+  (->> (concat (string-join (lsp-dart-flutter-command) " ") " --version")
        shell-command-to-string))
 
 (defun lsp-dart-get-dart-version ()

test/lsp-dart-utils-test.el

@@ -105,9 +105,15 @@
    (mock (getenv "FLUTTER_ROOT") => "/flutter/sdk")
    (should (equal (lsp-dart-get-flutter-sdk-dir) "/flutter/sdk"))))
 
-(ert-deftest lsp-dart-pub-command--test ()
+(ert-deftest lsp-dart-pub-command--old-version-test ()
   (lsp-dart-test-with-dart-sdk
-   (should (equal (lsp-dart-pub-command) (f-expand "bin/pub" dart-sdk)))))
+   (mock (lsp-dart-get-dart-version) => "2.15.5")
+   (should (equal (lsp-dart-pub-command) (list (f-expand "bin/pub" dart-sdk))))))
+
+(ert-deftest lsp-dart-pub-command--new-version-test ()
+  (lsp-dart-test-with-dart-sdk
+   (mock (lsp-dart-get-dart-version) => "2.16.0")
+   (should (equal (lsp-dart-pub-command) (list (f-expand "bin/dart" dart-sdk) "pub")))))
 
 (ert-deftest lsp-dart-pub-snapshot-command--test ()
   (lsp-dart-test-with-dart-sdk
@@ -119,7 +125,7 @@
 
 (ert-deftest lsp-dart-flutter-command--test ()
   (lsp-dart-test-with-flutter-sdk
-   (should (equal (lsp-dart-flutter-command) (f-expand (if (eq system-type 'windows-nt) "bin/flutter.bat" "bin/flutter") flutter-sdk)))))
+   (should (equal (lsp-dart-flutter-command) (list (f-expand (if (eq system-type 'windows-nt) "bin/flutter.bat" "bin/flutter") flutter-sdk))))))
 
 (ert-deftest lsp-dart-get-project-root--test ()
   (lsp-dart-test-from-dart-project