Remove pkg-info replaced by version string

Author: ericdallo

Makefile

@@ -92,6 +92,7 @@ clean:
 tag:
 	$(eval TAG := $(filter-out $@,$(MAKECMDGOALS)))
 	sed -i "s/;; Version: [0-9]\+.[0-9]\+.[0-9]\+/;; Version: $(TAG)/g" lsp-dart.el
+	sed -i "s/lsp-dart-version-string \"[0-9]\+.[0-9]\+.[0-9]\+\"/lsp-dart-version-string \"$(TAG)\"/g" lsp-dart.el
 	git add lsp-dart.el
 	git commit -m "Bump lsp-dart: $(TAG)"
 	git tag $(TAG)

lsp-dart.el

@@ -99,6 +99,7 @@ If unspecified, diagnostics will not be generated."
 
 ;;; Internal
 
+(defvar lsp-dart-version-string "1.19.2")
 (declare-function pkg-info-version-info "ext:pkg-info")
 
 (defun lsp-dart--library-folders ()
@@ -119,16 +120,12 @@ If unspecified, diagnostics will not be generated."
 
 (defun lsp-dart--server-command ()
   "Generate LSP startup command."
-  (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
-        (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))))
+  (or lsp-dart-server-command
+      (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"
+            (format "--client-version %s" lsp-dart-version-string))))
 
 (defun lsp-dart--activate-features ()
   "Activate lsp-dart features if enabled."
@@ -180,10 +177,8 @@ The returned string includes the version from main file header,
 
 If the version number could not be determined, signal an error."
   (interactive)
-  (let* ((version (and (require 'pkg-info nil t)
-                       (pkg-info-version-info 'lsp-dart)))
-         (lsp-dart-string (format "%s at %s @ Emacs %s"
-                                  (or version "unknown")
+  (let* ((lsp-dart-string (format "%s at %s @ Emacs %s"
+                                  lsp-dart-version-string
                                   (format-time-string "%Y.%m.%d" (current-time))
                                   emacs-version))
          (dart-sdk-string (if (lsp-dart-get-sdk-dir)

test/lsp-dart-test.el

@@ -57,11 +57,11 @@
     (stub lsp-dart-dart-command => "/sdk/bin/dart")
     (stub lsp-dart-get-sdk-dir => "/sdk")
     (should (equal (lsp-dart--server-command)
-                   '("/sdk/bin/dart"
+                   `("/sdk/bin/dart"
                      "/sdk/bin/snapshots/analysis_server.dart.snapshot"
                      "--lsp"
                      "--client-id emacs.lsp-dart"
-                     "--client-version unknown-version")))))
+                     ,(concat "--client-version " lsp-dart-version-string))))))
 
 (ert-deftest lsp-dart-version--test ()
   (with-mock
@@ -70,10 +70,8 @@
    (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"
+                                                     lsp-dart-version-string
                                                      (format-time-string "%Y.%m.%d" (current-time))
                                                      emacs-version)
                                              "[Dart SDK] 2.8.2\n"