Merge branch 'master' into add-helm-ls-support

Author: jcs090218

Diff for: CHANGELOG.org

@@ -24,6 +24,7 @@
   * Add fennel support
   * Add support for [[https://github.com/nextflow-io/language-server][Nextflow]]
   * Add TypeSpec support
+  * Add Tree-sitter query support
   * Add [[https://github.com/mrjosh/helm-ls][helm-ls]] (YAML Kubernetes Helm) support.
 
 ** 9.0.0

Diff for: clients/lsp-autotools.el

@@ -41,7 +41,7 @@
      makefile-bsdmake-mode
      makefile-imake-mode)
   "List of major mode that work with Autotools."
-  :type '(list symbol)
+  :type '(repeat function)
   :group 'lsp-autotools)
 
 (defun lsp-autotools--download-server (_client callback error-callback update?)

Diff for: clients/lsp-awk.el

@@ -36,7 +36,7 @@
   "Command to run the AWK language server."
   :group 'lsp-awk
   :risky t
-  :type '(list string))
+  :type '(repeat string))
 
 (lsp-register-client
  (make-lsp-client

Diff for: clients/lsp-clojure.el

@@ -94,7 +94,7 @@
                                           (expand-file-name "~/.gitlibs/libs"))
   "LSP clojure dirs that should be considered library folders."
   :group 'lsp-clojure
-  :type '(list string))
+  :type '(repeat directory))
 
 (defcustom lsp-clojure-test-tree-position-params nil
   "The optional test tree position params.

Diff for: clients/lsp-cucumber.el

@@ -41,7 +41,7 @@ This is only for development use."
 (defcustom lsp-cucumber-active-modes
   '( feature-mode)
   "List of major mode that work with Cucumber language server."
-  :type '(list symbol)
+  :type '(repeat function)
   :group 'lsp-cucumber)
 
 (lsp-defcustom lsp-cucumber-features

Diff for: clients/lsp-elixir.el

@@ -105,7 +105,7 @@ Leave as default to let `executable-find' search for it."
   :type '(repeat string)
   :package-version '(lsp-mode . "8.0.0"))
 
-(defcustom lsp-elixir-ls-version "v0.22.0"
+(defcustom lsp-elixir-ls-version "v0.25.0"
   "Elixir-Ls version to download.
 It has to be set before `lsp-elixir.el' is loaded and it has to
 be available here: https://github.com/elixir-lsp/elixir-ls/releases/"

Diff for: clients/lsp-eslint.el

@@ -176,7 +176,7 @@ workspace (see https://eslint.org/docs/user-guide/command-line-interface)."
 
 (defcustom lsp-eslint-code-action-disable-rule-comment t
   "Controls whether code actions to add a rule-disabling comment should be shown."
-  :type 'bool
+  :type 'boolean
   :package-version '(lsp-mode . "6.3"))
 
 (defcustom lsp-eslint-code-action-disable-rule-comment-location "separateLine"
@@ -193,12 +193,12 @@ Accepts the following values:
 (defcustom lsp-eslint-code-action-show-documentation t
   "Controls whether code actions to show documentation for an ESLint rule should
 be shown."
-  :type 'bool
+  :type 'boolean
   :package-version '(lsp-mode . "8.0.0"))
 
 (defcustom lsp-eslint-warn-on-ignored-files nil
   "Controls whether a warning should be emitted when a file is ignored."
-  :type 'bool
+  :type 'boolean
   :package-version '(lsp-mode . "8.0.0"))
 
 (defcustom lsp-eslint-rules-customizations []

Diff for: clients/lsp-glsl.el

@@ -36,7 +36,7 @@
   "Command to run the GLSL language server."
   :group 'lsp-glsl
   :risky t
-  :type '(list string))
+  :type '(repeat string))
 
 (lsp-register-client
  (make-lsp-client

Diff for: clients/lsp-idris.el

@@ -45,7 +45,9 @@
 (defcustom lsp-idris2-lsp-trace-server "off"
   "Traces the communication between VS Code and the language server."
   :group 'lsp-idris
-  :type '(choice (:tag "off" "messages" "verbose"))
+  :type '(choice (const "off")
+                 (const "messages")
+                 (const "verbose"))
   :package-version '(lsp-mode . "9.0.0"))
 
 (lsp-register-custom-settings

Diff for: clients/lsp-kotlin.el

@@ -50,7 +50,9 @@ executable with `exec-path'."
 
 (defcustom lsp-kotlin-trace-server "off"
   "Traces the communication between VSCode and the Kotlin language server."
-  :type '(choice (:tag "off" "messages" "verbose"))
+  :type '(choice (const "off")
+                 (const "messages")
+                 (const "verbose"))
   :group 'lsp-kotlin
   :package-version '(lsp-mode . "6.1"))
 
@@ -237,9 +239,9 @@ Requires lsp-inlay-hints-mode."
       (progn
         (require 'helm-source)
         (helm :sources (helm-make-source
-                           message 'helm-source-sync :candidates items
-                           :action '(("Identity" lambda (_)
-                                      (setq lsp-kotlin--helm-result (helm-marked-candidates)))))
+                        message 'helm-source-sync :candidates items
+                        :action '(("Identity" lambda (_)
+                                   (setq lsp-kotlin--helm-result (helm-marked-candidates)))))
               :buffer "*lsp-kotlin select*"
               :prompt message)
         lsp-kotlin--helm-result)
@@ -276,7 +278,7 @@ Requires lsp-inlay-hints-mode."
      (-if-let* ((option-items (-map (lambda (x)
                                       (list (lsp-get x :title)
                                             (lsp-get (lsp-get (lsp-get x :edit)
-                                                             :changes)
+                                                              :changes)
                                                      (intern (concat ":" (lsp--buffer-uri))))))
                                     member-options))
                 (selected-members (lsp-kotlin--completing-read-multiple "Select overrides" option-items nil)))

Diff for: clients/lsp-lisp.el

@@ -34,7 +34,7 @@
 (defcustom lsp-lisp-active-modes
   '( lisp-mode)
   "List of major mode that work with lisp."
-  :type '(list symbol)
+  :type '(repeat function)
   :group 'lsp-lisp)
 
 (defcustom lsp-lisp-alive-port 8006

Diff for: clients/lsp-lua.el

@@ -41,7 +41,8 @@
   :risky t
   :type 'file)
 
-(defcustom lsp-clients-emmy-lua-jar-path (f-join lsp-server-install-dir "EmmyLua-LS-all.jar")
+(defcustom lsp-clients-emmy-lua-jar-path
+  (f-join lsp-server-install-dir "EmmyLua-LS-all.jar")
   "Emmy Lua language server jar file."
   :group 'lsp-emmy-lua
   :version "8.0.0"
@@ -137,13 +138,17 @@
 
 (defcustom lsp-lua-color-mode "Semantic"
   "Color mode."
-  :type '(choice (:tag "Grammar" "Semantic"))
+  :type '(choice (const "Grammar")
+                 (const "Semantic"))
   :package-version '(lsp-mode . "8.0.0")
   :group 'lsp-lua-language-server)
 
 (defcustom lsp-lua-completion-call-snippet "Disable"
   "Shows function call snippets."
-  :type '(choice (:tag "Disable" "Both" "Replace"))
+  :type '(choice
+          (const "Disable")
+          (const "Both")
+          (const "Replace"))
   :package-version '(lsp-mode . "8.0.0")
   :group 'lsp-lua-language-server)
 
@@ -165,7 +170,9 @@ fragment.  If it is set to `0`, this feature can be disabled."
 
 (defcustom lsp-lua-completion-keyword-snippet "Replace"
   "Shows keyword syntax snippets."
-  :type '(choice (:tag "Disable" "Both" "Replace"))
+  :type '(choice (const "Disable")
+                 (const "Both")
+                 (const "Replace"))
   :package-version '(lsp-mode . "8.0.0")
   :group 'lsp-lua-language-server)
 
@@ -339,7 +346,8 @@ tolerance for this setting. Please adjust it to the appropriate value."
 (defcustom lsp-lua-runtime-file-encoding "utf8"
   "File encoding.  The `ansi' option is only available under the `Windows'
 platform."
-  :type '(choice (:tag "utf8" "ansi"))
+  :type '(choice (const "utf8")
+                 (const "ansi"))
   :package-version '(lsp-mode . "8.0.0")
   :group 'lsp-lua-language-server)
 
@@ -383,7 +391,11 @@ and the language server will provide special support.
 
 (defcustom lsp-lua-runtime-version "Lua 5.4"
   "Lua runtime version."
-  :type '(choice (:tag "Lua 5.1" "Lua 5.2" "Lua 5.3" "Lua 5.4" "LuaJIT"))
+  :type '(choice (const "Lua 5.1")
+                 (const "Lua 5.2")
+                 (const "Lua 5.3")
+                 (const "Lua 5.4")
+                 (const "LuaJIT"))
   :package-version '(lsp-mode . "8.0.0")
   :group 'lsp-lua-language-server)
 
@@ -676,13 +688,13 @@ and `../lib` ,exclude `../lib/temp`.
   "Download the latest version of lua-language-server and extract it to
 `lsp-lua-roblox-language-server-download-url'."
   (lsp-download-install
-    (lambda (&rest _)
+   (lambda (&rest _)
      (set-file-modes lsp-lua-roblox-language-server-bin #o0700)
      (funcall callback))
-     error-callback
-     :url lsp-lua-roblox-server-download-url
-     :store-path lsp-lua-roblox-server-store-path
-     :decompress :zip))
+   error-callback
+   :url lsp-lua-roblox-server-download-url
+   :store-path lsp-lua-roblox-server-store-path
+   :decompress :zip))
 
 (lsp-register-client
  (make-lsp-client

Diff for: clients/lsp-magik.el

@@ -58,13 +58,6 @@
   :group `lsp-magik
   :package-version '(lsp-mode . "9.0.0"))
 
-(lsp-defcustom lsp-magik-java-home nil
-  "Path to Java Runtime, Java 17 minimum."
-  :type `string
-  :group `lsp-magik
-  :package-version '(lsp-mode . "9.0.0")
-  :lsp-path "magik.javaHome")
-
 (lsp-defcustom lsp-magik-product-dirs []
   "Paths to (compiled, containing a libs/ directory) products."
   :type `lsp-string-vector

Diff for: clients/lsp-marksman.el

@@ -41,7 +41,7 @@
 
 (defcustom lsp-marksman-server-command-args '()
   "Command-line arguments for the marksman lsp server. Not normally Needed."
-  :type '(repeat 'string)
+  :type '(repeat string)
   :group 'lsp-marksman
   :package-version '(lsp-mode . "8.0.0"))
 

Diff for: clients/lsp-mdx.el

@@ -40,7 +40,7 @@
 
 (defcustom lsp-mdx-server-command-args '("--stdio")
   "Command-line arguments for the mdx lsp server."
-  :type '(repeat 'string)
+  :type '(repeat string)
   :group 'lsp-mdx
   :package-version '(lsp-mode . "8.0.0"))
 

Diff for: clients/lsp-perlnavigator.el

@@ -63,33 +63,40 @@ default to ~/.perlcriticrc. (no aliases, .bat files or ~/)."
   :group 'lsp-perlnavigator
   :package-version '(lsp-mode . "9.0.0"))
 
+(defconst lsp-perlnavigator--log-level-type
+  '(choice  (const "error")
+            (const "warning")
+            (const "info")
+            (const "hint")
+            (const "none")))
+
 (defcustom lsp-perlnavigator-severity5 "warning"
   "Editor Diagnostic severity level for Critic severity 5."
-  :type '(choice (:tag "error" "warning" "info" "hint" "none"))
+  :type lsp-perlnavigator--log-level-type
   :group 'lsp-perlnavigator
   :package-version '(lsp-mode . "9.0.0"))
 
 (defcustom lsp-perlnavigator-severity4 "info"
   "Editor Diagnostic severity level for Critic severity 4."
-  :type '(choice (:tag "error" "warning" "info" "hint" "none"))
+  :type lsp-perlnavigator--log-level-type
   :group 'lsp-perlnavigator
   :package-version '(lsp-mode . "9.0.0"))
 
 (defcustom lsp-perlnavigator-severity3 "hint"
   "Editor Diagnostic severity level for Critic severity 3."
-  :type '(choice (:tag "error" "warning" "info" "hint" "none"))
+  :type lsp-perlnavigator--log-level-type
   :group 'lsp-perlnavigator
   :package-version '(lsp-mode . "9.0.0"))
 
 (defcustom lsp-perlnavigator-severity2 "hint"
   "Editor Diagnostic severity level for Critic severity 2."
-  :type '(choice (:tag "error" "warning" "info" "hint" "none"))
+  :type lsp-perlnavigator--log-level-type
   :group 'lsp-perlnavigator
   :package-version '(lsp-mode . "9.0.0"))
 
 (defcustom lsp-perlnavigator-severity1 "hint"
   "Editor Diagnostic severity level for Critic severity 1."
-  :type '(choice (:tag "error" "warning" "info" "hint" "none"))
+  :type lsp-perlnavigator--log-level-type
   :group 'lsp-perlnavigator
   :package-version '(lsp-mode . "9.0.0"))
 
@@ -107,7 +114,9 @@ default to ~/.perlcriticrc. (no aliases, .bat files or ~/)."
 
 (defcustom lsp-perlnavigator-trace-server "messages"
   "Traces the communication between VS Code and the language server."
-  :type '(choice (:tag "off" "messages" "verbose"))
+  :type '(choice (const "off")
+                 (const "messages")
+                 (const "verbose"))
   :group 'lsp-perlnavigator
   :package-version '(lsp-mode . "9.0.0"))
 
@@ -166,9 +175,9 @@ default to ~/.perlcriticrc. (no aliases, .bat files or ~/)."
 
 
 (defvar lsp-perlnavigator--autoinstall-binary-path
-    (let ((exe-name (if (eq system-type 'windows-nt) "perlnavigator.exe" "perlnavigator")))
-      (f-join lsp-perlnavigator-autoinstall-dir "latest" (concat "perlnavigator" lsp-perlnavigator--os-suffix) exe-name))
-    "The path to the automatically installed language server executable.")
+  (let ((exe-name (if (eq system-type 'windows-nt) "perlnavigator.exe" "perlnavigator")))
+    (f-join lsp-perlnavigator-autoinstall-dir "latest" (concat "perlnavigator" lsp-perlnavigator--os-suffix) exe-name))
+  "The path to the automatically installed language server executable.")
 
 (lsp-dependency
  'perlnavigator

Diff for: clients/lsp-php.el

@@ -219,7 +219,9 @@ definitions are found in excluded files/folders."
 (lsp-defcustom lsp-intelephense-trace-server "off"
   "Traces the communication between VSCode and the intelephense
 language server."
-  :type '(choice (:tag "off" "messages" "verbose"))
+  :type '(choice (const "off")
+                 (const "messages")
+                 (const "verbose"))
   :group 'lsp-intelephense
   :package-version '(lsp-mode . "6.1")
   :lsp-path "intelephense.trace.server")
@@ -440,7 +442,7 @@ already present."
   "Alist mapping extension names to `composer' packages.
 These extensions can be installed using
 `lsp-phpactor-install-extension'."
-  :type '(alist :key-type "string" :value-type "string")
+  :type '(alist :key-type string :value-type string)
   :group 'lsp-phpactor)
 
 (defun lsp-phpactor-install-extension (extension)

Diff for: clients/lsp-pls.el

@@ -45,7 +45,7 @@
 
 (defcustom lsp-pls-arguments nil
   "Additional arguments needed to execute PLS."
-  :type '(repeat 'string)
+  :type '(repeat string)
   :group 'lsp-pls
   :package-version '(lsp-mode . "9.0.0"))
 
@@ -58,7 +58,7 @@ Defaults to the workspace root when not configured."
 
 (defcustom lsp-pls-include nil
   "Paths to be added to your @INC."
-  :type '(repeat 'string)
+  :type '(repeat string)
   :group 'lsp-pls
   :package-version '(lsp-mode . "9.0.0"))
 
@@ -99,7 +99,7 @@ By default, the perl used to run PLS will be used."
   "Additional arguments to pass to Perl when syntax checking.
 This is useful if there is a BEGIN block in your code that
 changes behavior depending on the contents of @ARGV."
-  :type '(repeat 'string)
+  :type '(repeat string)
   :group 'lsp-pls
   :package-version '(lsp-mode . "9.0.0"))
 

Diff for: clients/lsp-prolog.el

@@ -40,7 +40,7 @@
   "The prolog-lsp server command."
   :group 'lsp-prolog
   :risky t
-  :type '(list string))
+  :type '(repeat string))
 
 (lsp-register-client
  (make-lsp-client

Diff for: clients/lsp-purescript.el

@@ -68,7 +68,10 @@ Passed to the IDE server for source locations."
 (lsp-defcustom lsp-purescript-formatter "purty"
   "Tool to use to for formatting.
 Must be installed and on PATH (or npm installed with addNpmPath set)"
-  :type '(choice (:tag none purty purs-tidy pose))
+  :type '(choice (const "none")
+                 (const "purty")
+                 (const "purs-tidy")
+                 (const "pose"))
   :group 'lsp-purescript
   :package-version '(lsp-mode . "9.0.0")
   :lsp-path "purescript.formatter")