Merge branch 'master' into fix/lsp-rust-test-no-run

Author: Rutherther

.github/workflows/docs.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: CHANGELOG.org -> CHANGELOG.md
         uses: docker://pandoc/core:2.9
@@ -19,7 +19,7 @@ jobs:
 
       - uses: jcs090218/setup-emacs@master
         with:
-          version: 28.1
+          version: 30.2
 
       - uses: emacs-eask/setup-eask@master
         with:
@@ -29,7 +29,7 @@ jobs:
         run: 'make docs'
 
       - name: Docker Login
-        uses: docker/login-action@v1.14.1
+        uses: docker/login-action@v3.6.0
         with:
           registry: ghcr.io
           username: $GITHUB_ACTOR

.github/workflows/lint.yml

@@ -10,11 +10,11 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - uses: purcell/setup-emacs@master
+      - uses: jcs090218/setup-emacs@master
         with:
-          version: 29.4
+          version: 30.2
 
       - uses: emacs-eask/setup-eask@master
         with:

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
         emacs-version:
           - 28.2
           - 29.4
-          - 30.1
+          - 30.2
         experimental: [false]
         include:
           - os: ubuntu-latest
@@ -67,7 +67,7 @@ jobs:
       if: matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-24.04-arm' || matrix.os == 'macos-latest'
       run: "cmake --version"
 
-    - uses: actions/setup-python@v5.1.0
+    - uses: actions/setup-python@v6.0.0
       with:
         python-version: "3.9"
 
@@ -87,7 +87,7 @@ jobs:
       if: runner.os == 'Linux'
       run: "clangd-15 --version"
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Grant execution permission (Unix)
       if: matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-24.04-arm' || matrix.os == 'macos-latest'

CHANGELOG.org

@@ -1,5 +1,7 @@
 * Changelog
 ** Unreleased 9.0.1
+  * Fix Accommodate renaming of lsp-postgres binaries
+  * Fix =lsp-org= for org >= 9.7 (see #4300)
   * Add format on save support
   * Fix beancount journal file init option
   * Add support for [[https://github.com/glehmann/earthlyls][earthlyls]]
@@ -43,6 +45,8 @@
   * Make lsp-headerline--check-breadcrumb public
   * Added Odin langauge server support [[https://github.com/DanielGavin/ols][ols]]
   * Fix bug in lsp-odin where ~f-join~ collapses double slashes. Using ~format~ instead.
+  * Fix missing gopls inlay hints when ~lsp-use-plist~ is true
+  * Fix bug where persist was attempted when lsp-session-file is nil
   * Debugging tests in Rust no longer runs all the tests prior to launching debug session.
 
 ** 9.0.0

clients/lsp-eslint.el

@@ -245,6 +245,12 @@ stored."
   :type 'string
   :package-version '(lsp-mode . "8.0.0"))
 
+(defcustom lsp-eslint-multi-root nil
+  "If non nil, `eslint' will be started in multi-root mode."
+  :type 'boolean
+  :safe #'booleanp
+  :package-version '(lsp-mode . "9.0.1"))
+
 (defun lsp--find-eslint ()
   (or
    (when-let* ((workspace-folder (lsp-find-session-folder (lsp-session) default-directory)))
@@ -422,7 +428,7 @@ to allow or deny it.")
   :priority -1
   :completion-in-comments? t
   :add-on? t
-  :multi-root t
+  :multi-root lsp-eslint-multi-root
   :notification-handlers (ht ("eslint/status" #'lsp-eslint-status-handler))
   :request-handlers (ht ("workspace/configuration" #'lsp-eslint--configuration)
                         ("eslint/openDoc" #'lsp-eslint--open-doc)

clients/lsp-go.el

@@ -449,7 +449,13 @@ Will update if UPDATE? is t"
                   :after-open-fn (lambda ()
                                    ;; https://github.com/golang/tools/commit/b2d8b0336
                                    (setq-local lsp-completion-filter-on-incomplete nil))
-                  :download-server-fn #'lsp-go--cls-download-server))
+                  :download-server-fn #'lsp-go--cls-download-server
+                  :initialized-fn (lambda (workspace)
+                                    (let ((caps (lsp--workspace-server-capabilities workspace)))
+                                      (unless (lsp-get caps :inlayHintProvider)
+                                        (lsp:set-server-capabilities-inlay-hint-provider? caps t))
+                                      (unless (lsp-get caps :codeLensProvider)
+                                        (lsp:set-server-capabilities-code-lens-provider? caps t))))))
 
 (lsp-consistency-check lsp-go)
 

clients/lsp-graphql.el

@@ -48,12 +48,18 @@
   :type '(repeat string)
   :group 'lsp-graphql)
 
+(defcustom lsp-graphql-activated-modes '(js-mode js2-mode typescript-mode typescript-ts-mode)
+  "List of major modes that can activate the GraphQL language server.
+When a buffer is in one of these modes, the GraphQL language server
+may be activated if appropriate GraphQL content is detected."
+  :type '(repeat symbol)
+  :group 'lsp-graphql)
+
 (defun lsp-graphql-activate-p (filename &optional _)
   "Check if the GraphQL language server should be enabled based on FILENAME."
   (let ((target-extensions (mapconcat 'identity lsp-graphql-target-file-extensions "\\|")))
     (or (string-match-p (format "\\.\\(?:%s\\)\\'" target-extensions) filename)
-        (and (derived-mode-p 'js-mode 'js2-mode 'typescript-mode 'typescript-ts-mode)
-             (not (derived-mode-p 'json-mode))))))
+        (apply 'derived-mode-p lsp-graphql-activated-modes))))
 
 
 (lsp-register-client

clients/lsp-javascript.el

@@ -824,6 +824,15 @@ to run the command in."
         (lsp-clients-typescript-require-resolve (f-parent (lsp-package-path 'typescript)))
       (lsp-package-path 'typescript))))
 
+(lsp-defun lsp-clients-typescript-handle-interactive-actions ((&Command :arguments? [args]))
+  (pcase (lsp-get args :action)
+    ("Move to file"
+     (let* ((directory (file-name-directory (buffer-file-name)))
+            (target-file-name (expand-file-name (read-file-name "Destination file: " directory))))
+       (lsp-put args
+                :interactiveRefactorArguments
+                `((targetFile . ,target-file-name)))))))
+
 (lsp-register-client
  (make-lsp-client :new-connection (lsp-stdio-connection (lambda ()
                                                           `(,(lsp-package-path 'typescript-language-server)
@@ -845,6 +854,7 @@ to run the command in."
                                                (list :plugins lsp-clients-typescript-plugins))
                                              (when lsp-clients-typescript-preferences
                                                (list :preferences lsp-clients-typescript-preferences))
+                                             (list :supportsMoveToFileCodeAction t)
                                              `(:tsserver ( :path ,(lsp-clients-typescript-server-path)
                                                            ,@lsp-clients-typescript-tsserver))))
                   :initialized-fn (lambda (workspace)
@@ -858,6 +868,7 @@ to run the command in."
                                           (format-enable (or lsp-javascript-format-enable lsp-typescript-format-enable)))
                                       (lsp:set-server-capabilities-document-formatting-provider? caps format-enable)
                                       (lsp:set-server-capabilities-document-range-formatting-provider? caps format-enable)))
+                  :action-filter 'lsp-clients-typescript-handle-interactive-actions
                   :ignore-messages '("readFile .*? requested by TypeScript but content not available")
                   :server-id 'ts-ls
                   :request-handlers (ht ("_typescript.rename" #'lsp-javascript--rename))

clients/lsp-magik.el

@@ -200,7 +200,7 @@
                       "-jar"
                       (substitute-in-file-name lsp-magik-ls-path)
                       "--debug")))
-  :activation-fn (lsp-activate-on "magik")
+  :activation-fn (lsp-activate-on "magik" "sw-product-def" "sw-module-def" "sw-load-list")
   :initialized-fn (lambda (workspace)
                     (with-lsp-workspace workspace
                       (lsp--set-configuration (lsp-configuration-section "magik"))))

clients/lsp-ocaml.el

@@ -122,8 +122,7 @@
 
 OCaml-lsp custom protocol documented here
 https://github.com/ocaml/ocaml-lsp/blob/master/ocaml-lsp-server/docs/ocamllsp/switchImplIntf-spec.md"
-  (-if-let* ((params (lsp-make-ocaml-lsp-switch-impl-intf-params
-                      :uri (lsp--buffer-uri)))
+  (-if-let* ((params (make-vector 1 (lsp--buffer-uri)))
              (uris (lsp-request "ocamllsp/switchImplIntf" params)))
       uris
     (lsp--warn "Your version of ocaml-lsp doesn't support the switchImplIntf extension")))
@@ -158,6 +157,18 @@ https://github.com/ocaml/ocaml-lsp/blob/master/ocaml-lsp-server/docs/ocamllsp/ge
       (lsp-request "ocamllsp/getDocumentation" params)
     (lsp--warn "Your version of ocaml-lsp doesn't support the getDocumentation extension")))
 
+(defun lsp-ocaml--infer-intf ()
+  "Infer the interface of the given URI.
+
+The URI should correspond to an implementation file, not an interface one.
+
+OCaml-lsp protocol is documented here:
+https://github.com/ocaml/ocaml-lsp/blob/master/ocaml-lsp-server/docs/ocamllsp/inferIntf-spec.md"
+  (-if-let* ((params (make-vector 1 (lsp--buffer-uri)))
+             (result (lsp-request "ocamllsp/inferIntf" params)))
+      result
+    (lsp--warn "Your version of ocaml-lsp doesn't support the inferIntf extension")))
+
 ;;; -------------------
 ;;; OCaml-lsp general utilities
 ;;; -------------------
@@ -170,6 +181,15 @@ https://github.com/ocaml/ocaml-lsp/blob/master/ocaml-lsp-server/docs/ocamllsp/ge
 ;;; OCaml-lsp URI utilities
 ;;; -------------------
 
+(defun lsp-ocaml--is-interface (uri)
+  "Return non-nil if the given URI is an interface, nil otherwise."
+  (let ((path (lsp--uri-to-path uri)))
+    (string-match-p "\\.\\(mli\\|rei\\|eliomi\\)\\'" path)))
+
+(defun lsp-ocaml--on-interface ()
+  "Return non-nil if the current URI is an interface, nil otherwise."
+  (lsp-ocaml--is-interface (lsp--buffer-uri)))
+
 (defun lsp-ocaml--load-uri (uri &optional other-window)
   "Check if URI exists and open its buffer or create a new one.
 
@@ -328,6 +348,31 @@ If TYPE is a single-line that represents a module type, reformat it."
 
 ;;; The following functions are interactive implementations of the OCaml-lsp requests
 
+(defun lsp-ocaml-infer-interface ()
+  "Infer the interface for the current file."
+  (interactive)
+  (let* ((current-uri (lsp--buffer-uri))
+         (intf-uri (if (lsp-ocaml--is-interface current-uri)
+                       current-uri
+                     (lsp-ocaml--find-alternate-uri)))
+         (impl-uri (if (lsp-ocaml--is-interface current-uri)
+                       (lsp-ocaml--find-alternate-uri)
+                     current-uri))
+         (intf-path (lsp--uri-to-path intf-uri))
+         (impl-path (lsp--uri-to-path impl-uri)))
+    (if (lsp-ocaml--load-uri impl-uri) ; the impl file needs to be loaded
+        (when (y-or-n-p
+               (format "Try to generate an interface for %s? " impl-path))
+          (let ((result (lsp-ocaml--infer-intf)))
+            (with-current-buffer (get-buffer-create intf-path)
+              (when (or (= (buffer-size) 0)
+                        (y-or-n-p "The buffer is not empty, overwrite it? "))
+                (erase-buffer)
+                (insert result)
+                ;; Create the file if it doesn’t exist
+                (unless (file-exists-p intf-path)
+                  (write-file intf-path)))))))))
+
 (defun lsp-ocaml-find-alternate-file ()
   "Return the URI corresponding to the alternate file if there's only one or prompt for a choice."
   (interactive)