test: fix server-command tests

Use lsp-dart-version-at-least-p instead.

Author: elken

lsp-dart.el

@@ -110,27 +110,20 @@ If unspecified, diagnostics will not be generated."
         (append (list (file-name-directory (buffer-file-name))) lsp-dart-extra-library-directories)
       lsp-dart-extra-library-directories)))
 
-(defun lsp-dart--dart-capabiliities (&optional sdk-root)
-  "Given an SDK-ROOT, return capabilities for that dart version.
-Default to `lsp-dart-get-sdk-dir' if no root is passed.
-Returns nil if an invalid SDK-ROOT has been passed."
-  (when-let* ((root (or sdk-root lsp-dart-sdk-dir (lsp-dart-get-sdk-dir)))
-              (dart-version (string-trim
-                             (with-temp-buffer
-                               (insert-file-contents (expand-file-name "version" root))
-                               (buffer-string)))))
-    `((canUseLanguageServer . ,(version<= "3.14.4" dart-version)))))
+(defun lsp-dart--dart-capabiliities ()
+  "Return capabilities for current dart version."
+  `((canUseLanguageServer . ,(lsp-dart-version-at-least-p "2.14.4"))))
 
 (defun lsp-dart--server-command ()
   "Generate LSP startup command."
   (or lsp-dart-server-command
-      (list (lsp-dart-dart-command)
-            (if (alist-get 'canUseLanguageServer (lsp-dart--dart-capabiliities))
-                "language-server"
-              (expand-file-name "bin/snapshots/analysis_server.dart.snapshot" (lsp-dart-get-sdk-dir))
-              "--lsp")
-            "--client-id emacs.lsp-dart"
-            (format "--client-version %s" lsp-dart-version-string))))
+      `(,(lsp-dart-dart-command)
+        ,@(if (alist-get 'canUseLanguageServer (lsp-dart--dart-capabiliities))
+              (list "language-server")
+            (list (expand-file-name "bin/snapshots/analysis_server.dart.snapshot" (lsp-dart-get-sdk-dir))
+                  "--lsp"))
+        "--client-id emacs.lsp-dart"
+        ,(format "--client-version %s" lsp-dart-version-string))))
 
 (defun lsp-dart--activate-features ()
   "Activate lsp-dart features if enabled."

test/lsp-dart-test.el

@@ -54,14 +54,26 @@
 
 (ert-deftest lsp-dart--server-command--default-test ()
   (with-mock
-    (stub lsp-dart-dart-command => "/sdk/bin/dart")
-    (stub lsp-dart-get-sdk-dir => "/sdk")
-    (should (equal (lsp-dart--server-command)
-                   `("/sdk/bin/dart"
-                     ,(f-expand "/sdk/bin/snapshots/analysis_server.dart.snapshot" (f-root))
-                     "--lsp"
-                     "--client-id emacs.lsp-dart"
-                     ,(concat "--client-version " lsp-dart-version-string))))))
+   (stub lsp-dart-dart-command => "/sdk/bin/dart")
+   (stub lsp-dart-get-sdk-dir => "/sdk")
+   (stub lsp-dart-get-dart-version => "2.14.1")
+   (should (equal (lsp-dart--server-command)
+                  `("/sdk/bin/dart"
+                    ,(f-expand "/sdk/bin/snapshots/analysis_server.dart.snapshot" (f-root))
+                    "--lsp"
+                    "--client-id emacs.lsp-dart"
+                    ,(concat "--client-version " lsp-dart-version-string))))))
+
+(ert-deftest lsp-dart--server-command--lsp-test ()
+  (with-mock
+   (stub lsp-dart-dart-command => "/sdk/bin/dart")
+   (stub lsp-dart-get-sdk-dir => "/sdk")
+   (stub lsp-dart-get-dart-version => "2.14.4")
+   (should (equal (lsp-dart--server-command)
+                  `("/sdk/bin/dart"
+                    "language-server"
+                    "--client-id emacs.lsp-dart"
+                    ,(concat "--client-version " lsp-dart-version-string))))))
 
 (ert-deftest lsp-dart-version--test ()
   (with-mock