Print the dart sdk version on

Author: ericdallo

lsp-dart-utils.el

@@ -156,10 +156,14 @@ FLUTTER_ROOT environment variable."
 
 ;; Version
 
-(defun lsp-dart--get-dart-version ()
+(defun lsp-dart-get-full-dart-version ()
   "Retrieve the dart version from shell command."
   (->> (concat (lsp-dart-dart-command) " --version")
-       shell-command-to-string
+       shell-command-to-string))
+
+(defun lsp-dart--get-dart-version ()
+  "Retrieve the dart version from shell command."
+  (->> (lsp-dart-get-full-dart-version)
        split-string
        (nth 3)))
 

lsp-dart.el

@@ -126,12 +126,15 @@ The returned string includes the version from main file header,
 If the version number could not be determined, signal an error."
   (interactive)
   (if (require 'pkg-info nil t)
-      (let ((version (pkg-info-version-info 'lsp-dart)))
-        (lsp-dart-log
-         "%s at %s @ Emacs %s"
-         version
-         (format-time-string "%Y.%m.%d" (current-time))
-         emacs-version))
+      (let* ((version (pkg-info-version-info 'lsp-dart))
+             (lsp-dart-string (format "%s at %s @ Emacs %s"
+                                      version
+                                      (format-time-string "%Y.%m.%d" (current-time))
+                                      emacs-version))
+             (dart-sdk-string (concat (propertize "[Dart SDK] "
+                                                  'face 'font-lock-function-name-face)
+                                      (lsp-dart-get-full-dart-version))))
+        (lsp-dart-log "%s\n%s" lsp-dart-string dart-sdk-string))
     (error "Cannot determine version without package 'pkg-info'")))
 
 

test/lsp-dart-test.el

@@ -73,9 +73,11 @@
 
 (ert-deftest lsp-dart-version--test ()
   (let ((pkg-version (lsp-dart-test-package-version "lsp-dart.el")))
-    (should (equal (lsp-dart-version) (format "[LSP Dart] %s at %s @ Emacs %s"
-                                              pkg-version
-                                              (format-time-string "%Y.%m.%d" (current-time))
-                                              emacs-version)))))
+    (with-mock
+     (stub lsp-dart-get-full-dart-version => "2.8.2")
+     (should (equal (lsp-dart-version) (format "[LSP Dart] %s at %s @ Emacs %s\n[Dart SDK] 2.8.2"
+                                               pkg-version
+                                               (format-time-string "%Y.%m.%d" (current-time))
+                                               emacs-version))))))
 
 ;;; lsp-dart-test.el ends here

test/lsp-dart-utils-test.el

@@ -156,6 +156,12 @@
     (mock (lsp-workspace-status nil "workspace"))
     (lsp-dart-workspace-status nil "workspace")))
 
+(ert-deftest lsp-dart--get-full-dart-version--test ()
+  (with-mock
+    (mock (lsp-dart-dart-command) => "dart")
+    (mock (shell-command-to-string "dart --version") => "Dart VM version: 2.9.0-4.0.dev")
+    (should (equal (lsp-dart-get-full-dart-version) "Dart VM version: 2.9.0-4.0.dev"))))
+
 (ert-deftest lsp-dart--get-dart-version--test ()
   (with-mock
     (mock (lsp-dart-dart-command) => "dart")