Skip to content

Fix lsp-org compatibility with Org 9.7 #4889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix lsp-org compatibility with Org 9.7 #4889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.org
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
* Changelog
** Unreleased 9.0.1
* 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]]
Expand Down
27 changes: 26 additions & 1 deletion lsp-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9713,6 +9713,24 @@ This avoids overloading the server with many files when starting Emacs."
(declare-function org-src-get-lang-mode "ext:org-src")
(declare-function org-element-context "ext:org-element")

(defvar lsp--org-element-use-new-api nil
"Whether org-element supports the new property-based API.
This is t for org-mode 9.7 and later, nil for earlier versions.
Determined at load time to avoid runtime performance impact.")

(defun lsp--detect-org-element-api ()
"Detect which org-element API version is available.
Returns t if org 9.7+ API is available (property-based), nil otherwise."
(with-temp-buffer
(insert "#+BEGIN_SRC emacs-lisp\n(+ 1 1)\n#+END_SRC")
(org-mode)
(goto-char (point-min))
(let ((elem (org-element-context)))
(not (plist-member (cl-second elem) :begin)))))

(with-eval-after-load 'org-element
(setq lsp--org-element-use-new-api (lsp--detect-org-element-api)))

(defun lsp--virtual-buffer-update-position ()
(-if-let (virtual-buffer (-first (-lambda ((&plist :in-range))
(funcall in-range))
Expand Down Expand Up @@ -9811,7 +9829,14 @@ defaults to `progress-bar."
(save-excursion
(funcall goto-buffer)
(funcall f))))))
((&plist :begin :end :post-blank :language) (cl-second (org-element-context)))
((begin end post-blank language)
(if lsp--org-element-use-new-api
;; org 9.7+ - use property-based API
(with-no-warnings
(--map (org-element-property it (org-element-context) nil t)
'(:begin :end :post-blank :language)))
;; org < 9.7 - use plist destructuring
(cl-second (org-element-context))))
((&alist :tangle file-name) (cl-third (org-babel-get-src-block-info 'light)))

(file-name (if file-name
Expand Down