masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-11 06:30:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve tree-sitter's prev-sibling indent anchor

Browse source 
Now it handles the case where NODE is nil when indenting an empty
line: it tries to get the previous sibling nonetheless.

* lisp/progmodes/c-ts-mode.el (c-ts-mode--anchor-prev-sibling):
* lisp/treesit.el (treesit-simple-indent-presets): Add an or form to
handle more cases.
This commit is contained in:
Yuan Fu 2023-03-01 13:55:53 -08:00
parent db50545e3e
commit 6b2720778d
No known key found for this signature in database
GPG key ID: 56E19BC57664A442
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/progmodes/c-ts-mode.el
View file

@ -257,7 +257,7 @@ is actually the parent of point at the moment of indentation."
0 0
c-ts-mode-indent-offset))) c-ts-mode-indent-offset)))
(defun c-ts-mode--anchor-prev-sibling (node &rest _) (defun c-ts-mode--anchor-prev-sibling (node parent bol &rest _)
"Return the start of the previous named sibling of NODE. "Return the start of the previous named sibling of NODE.
This anchor handles the special case where the previous sibling This anchor handles the special case where the previous sibling
@ -273,8 +273,14 @@ The anchor of \"int y = 2;\" should be \"int x = 1;\" rather than
the labeled_statement. the labeled_statement.
Return nil if a) there is no prev-sibling, or 2) prev-sibling Return nil if a) there is no prev-sibling, or 2) prev-sibling
doesn't have a child." doesn't have a child.
(when-let ((prev-sibling (treesit-node-prev-sibling node t)))
PARENT and BOL are like other anchor functions."
(when-let ((prev-sibling
(or (treesit-node-prev-sibling node t)
(treesit-node-prev-sibling
(treesit-node-first-child-for-pos parent bol) t)
(treesit-node-child parent -1 t))))
(while (and prev-sibling (while (and prev-sibling
(equal "labeled_statement" (equal "labeled_statement"
(treesit-node-type prev-sibling))) (treesit-node-type prev-sibling)))

12
lisp/treesit.el
View file

@ -1237,9 +1237,17 @@ See `treesit-simple-indent-presets'.")
(line-beginning-position)) (line-beginning-position))
(throw 'term (point))) (throw 'term (point)))
(setq parent (treesit-node-parent parent))))))) (setq parent (treesit-node-parent parent)))))))
(cons 'prev-sibling (lambda (node &rest _) (cons 'prev-sibling (lambda (node parent bol &rest _)
(treesit-node-start (treesit-node-start
(treesit-node-prev-sibling node)))) (or (treesit-node-prev-sibling node t)
;; If node is nil (indenting empty
;; line), we still try to guess the
;; previous sibling.
(treesit-node-prev-sibling
(treesit-node-first-child-for-pos
parent bol)
t)
(treesit-node-child parent -1 t)))))
(cons 'no-indent (lambda (_n _p bol &rest _) bol)) (cons 'no-indent (lambda (_n _p bol &rest _) bol))
(cons 'prev-line (lambda (_n _p bol &rest _) (cons 'prev-line (lambda (_n _p bol &rest _)
(save-excursion (save-excursion