procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the use of adaptive-fill-regexp in treesit indent preset

Browse source 
* lisp/treesit.el (treesit-simple-indent-presets):
adaptive-fill-regexp don't have a capture group (the group in the
default value is supposed to be a non-capture group), so don't use the
group. Also, in the second diff hunk, replace looking-at with
looking-at-p so it doesn't override match data that we use later.
This commit is contained in:
Yuan Fu 2023-10-21 21:08:44 -07:00
parent 1098c114b7
commit 893c344b4e
No known key found for this signature in database
GPG key ID: 56E19BC57664A442
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/treesit.el
View file

@ -1217,8 +1217,10 @@ See `treesit-simple-indent-presets'.")
(goto-char bol)
(setq this-line-has-prefix
(and (looking-at adaptive-fill-regexp)
(match-string 1)))
(and (looking-at-p adaptive-fill-regexp)
(not (string-match-p
(rx bos (* whitespace) eos)
(match-string 0)))))
(forward-line -1)
(and (>= (point) comment-start-bol)
@ -1226,7 +1228,7 @@ See `treesit-simple-indent-presets'.")
(looking-at adaptive-fill-regexp)
;; If previous line is an empty line, don't
;; indent.
(not (looking-at (rx (* whitespace) eol)))
(not (looking-at-p (rx (* whitespace) eol)))
;; Return the anchor. If the indenting line
;; has a prefix and the previous line also
;; has a prefix, indent to the beginning of