Merge pull request #23 from emacs-languagetool/fix/install

fix(src): Allow globally installed language server

Author: jcs090218

.github/workflows/test.yml

@@ -18,7 +18,6 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         emacs-version:
-          - 26.3
           - 27.2
           - 28.1
           - snapshot

CHANGELOG.md

@@ -10,6 +10,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 
 * Allow latest version return `nil` value if fails.
 * Fix server installation on Unix system (#20)
+* Allow globally installed language server (#23)
 
 ## 0.2.0
 > Released Aug 26, 2021

lsp-ltex.el

@@ -6,7 +6,7 @@
 ;; Author: Shen, Jen-Chieh <[email protected]>
 ;; URL: https://github.com/emacs-languagetool/lsp-ltex
 ;; Version: 0.2.1
-;; Package-Requires: ((emacs "26.1") (lsp-mode "6.1"))
+;; Package-Requires: ((emacs "27.1") (lsp-mode "6.1"))
 ;; Keywords: convenience lsp languagetool checker
 
 ;; This file is NOT part of GNU Emacs.
@@ -264,13 +264,19 @@ This is use to unzip the language server files."
 This is use to active language server and check if language server's existence."
   (expand-file-name "latest" lsp-ltex-server-store-path))
 
+(defun lsp-ltex--store-locally-p ()
+  "Return non-nil if language server is installed locally."
+  (and (string-prefix-p lsp-server-install-dir lsp-ltex-server-store-path)
+       (file-directory-p lsp-ltex-server-store-path)))
+
 (defun lsp-ltex--current-version ()
   "Return the current version of LTEX."
-  (when (file-directory-p lsp-ltex-server-store-path)
-    (when-let* ((gz-files (directory-files-recursively lsp-ltex-server-store-path "\\.gz"))
-                (tar (car gz-files))
-                (fn (file-name-nondirectory (lsp-ltex--s-replace ".tar.gz" "" tar))))
-      (lsp-ltex--s-replace "ltex-ls-" "" fn))))
+  (if (lsp-ltex--store-locally-p)
+      (when-let* ((gz-files (directory-files-recursively lsp-ltex-server-store-path "\\.gz"))
+                  (tar (car gz-files))
+                  (fn (file-name-nondirectory (lsp-ltex--s-replace ".tar.gz" "" tar))))
+        (lsp-ltex--s-replace "ltex-ls-" "" fn))
+    (ignore-errors (gethash "ltex-ls" (json-parse-string (shell-command-to-string "ltex-ls -V"))))))
 
 (defun lsp-ltex--latest-version ()
   "Return the latest version from remote repository."
@@ -290,7 +296,7 @@ This is use to active language server and check if language server's existence."
    'ltex-ls
    '(:system "ltex-ls")
    `(:download :url ,lsp-ltex--server-download-url
-               :store-path ,(lsp-ltex--downloaded-extension-path))))
+     :store-path ,(lsp-ltex--downloaded-extension-path))))
 
 (defcustom lsp-ltex-version (or (lsp-ltex--current-version)
                                 (lsp-ltex--latest-version)
@@ -346,11 +352,13 @@ If current server not found, install it then."
   "Return the server entry file.
 
 This file is use to activate the language server."
-  (concat (file-name-as-directory (lsp-ltex--extension-root))
-          (file-name-as-directory "bin")
-          (if (eq system-type 'windows-nt)
-              "ltex-ls.bat"
-            "ltex-ls")))
+  (if (lsp-ltex--store-locally-p)
+      (concat (file-name-as-directory (lsp-ltex--extension-root))
+              (file-name-as-directory "bin")
+              (if (eq system-type 'windows-nt)
+                  "ltex-ls.bat"
+                "ltex-ls"))
+    (executable-find "ltex-ls")))
 
 (defun lsp-ltex--server-command ()
   "Startup command for LTEX language server."
@@ -390,7 +398,7 @@ This file is use to activate the language server."
  (make-lsp-client
   :new-connection (lsp-stdio-connection
                    #'lsp-ltex--server-command
-                   (lambda () (file-exists-p (lsp-ltex--extension-root))))
+                   (lambda () (and (file-executable-p (lsp-ltex--server-entry)) (file-exists-p (lsp-ltex--server-entry)))))
   :activation-fn (lambda (&rest _) (apply #'derived-mode-p lsp-ltex-active-modes))
   :priority -2
   :add-on? t