Fix dart server command when pkg-info is not available

Author: ericdallo

lsp-dart.el

@@ -3,7 +3,7 @@
 ;; Copyright (C) 2020 Eric Dallo
 
 ;; Version: 1.19.2
-;; Package-Requires: ((emacs "26.1") (lsp-treemacs "0.3") (lsp-mode "7.0.1") (dap-mode "0.6") (f "0.20.0") (dash "2.14.1") (pkg-info "0.4") (dart-mode "1.0.5"))
+;; Package-Requires: ((emacs "26.1") (lsp-treemacs "0.3") (lsp-mode "7.0.1") (dap-mode "0.6") (f "0.20.0") (dash "2.14.1") (dart-mode "1.0.5"))
 ;; Keywords: languages, extensions
 ;; URL: https://emacs-lsp.github.io/lsp-dart
 
@@ -119,15 +119,16 @@ If unspecified, diagnostics will not be generated."
 
 (defun lsp-dart--server-command ()
   "Generate LSP startup command."
-  (let ((client-version (when (require 'pkg-info nil t)
-                          (format "--client-version %s"
-                                  (pkg-info-version-info 'lsp-dart)))))
+  (let ((client-version (format "--client-version %s"
+                                (or (when (require 'pkg-info nil t)
+                                      (pkg-info-version-info 'lsp-dart))
+                                    "unknown-version"))))
     (or lsp-dart-server-command
-        `(,(lsp-dart-dart-command)
-          ,(expand-file-name (f-join (lsp-dart-get-sdk-dir) "bin/snapshots/analysis_server.dart.snapshot"))
-          "--lsp"
-          "--client-id emacs.lsp-dart"
-          ,client-version))))
+        (list (lsp-dart-dart-command)
+              (expand-file-name (f-join (lsp-dart-get-sdk-dir) "bin/snapshots/analysis_server.dart.snapshot"))
+              "--lsp"
+              "--client-id emacs.lsp-dart"
+              client-version))))
 
 (defun lsp-dart--activate-features ()
   "Activate lsp-dart features if enabled."

test/lsp-dart-test.el

@@ -56,29 +56,29 @@
   (with-mock
     (stub lsp-dart-dart-command => "/sdk/bin/dart")
     (stub lsp-dart-get-sdk-dir => "/sdk")
-    (mock (pkg-info-version-info 'lsp-dart) => "1.123.456")
     (should (equal (lsp-dart--server-command)
                    '("/sdk/bin/dart"
                      "/sdk/bin/snapshots/analysis_server.dart.snapshot"
                      "--lsp"
                      "--client-id emacs.lsp-dart"
-                     "--client-version 1.123.456")))))
+                     "--client-version unknown-version")))))
 
 (ert-deftest lsp-dart-version--test ()
-  (let ((pkg-version (lsp-dart-test-package-version "lsp-dart.el")))
-    (with-mock
-     (stub lsp-dart-get-full-dart-version => "2.8.2")
-     (stub lsp-dart-get-sdk-dir => t)
-     (stub lsp-dart-get-flutter-sdk-dir => "flutter-sdk")
-     (stub lsp-dart-flutter-project-p => t)
-     (stub lsp-dart-get-project-entrypoint => "/path/to/entrypoint")
-     (should (equal (lsp-dart-version) (concat (format "[LSP Dart] %s at %s @ Emacs %s\n"
-                                                       pkg-version
-                                                       (format-time-string "%Y.%m.%d" (current-time))
-                                                       emacs-version)
-                                               "[Dart SDK] 2.8.2\n"
-                                               "[Flutter SDK] flutter-sdk\n"
-                                               "[Flutter project] true\n"
-                                               "[Project entrypoint] /path/to/entrypoint"))))))
+  (with-mock
+   (stub lsp-dart-get-full-dart-version => "2.8.2")
+   (stub lsp-dart-get-sdk-dir => t)
+   (stub lsp-dart-get-flutter-sdk-dir => "flutter-sdk")
+   (stub lsp-dart-flutter-project-p => t)
+   (stub lsp-dart-get-project-entrypoint => "/path/to/entrypoint")
+   (mock (require 'pkg-info nil t) => t)
+   (mock (pkg-info-version-info 'lsp-dart) => "1.2.3")
+   (should (equal (lsp-dart-version) (concat (format "[LSP Dart] %s at %s @ Emacs %s\n"
+                                                     "1.2.3"
+                                                     (format-time-string "%Y.%m.%d" (current-time))
+                                                     emacs-version)
+                                             "[Dart SDK] 2.8.2\n"
+                                             "[Flutter SDK] flutter-sdk\n"
+                                             "[Flutter project] true\n"
+                                             "[Project entrypoint] /path/to/entrypoint")))))
 
 ;;; lsp-dart-test.el ends here