emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Optimize doom-point-in-*-p functions

Browse source 
Since we won't be dumping smartparens just yet, use it for now.
This commit is contained in:
Henrik Lissner 2020-01-03 02:44:29 -05:00
parent 8857dc1a5e
commit 8ff15c2aeb
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
core/autoload/text.el
View file

@ -43,21 +43,7 @@ lines, above and below, with only whitespace in between."
POS defaults to the current position." POS defaults to the current position."
(let ((pos (or pos (point)))) (let ((pos (or pos (point))))
(or (run-hook-with-args-until-success 'doom-point-in-comment-functions pos) (or (run-hook-with-args-until-success 'doom-point-in-comment-functions pos)
(let ((ppss (syntax-ppss pos))) (sp-point-in-comment pos))))
(or (nth 4 ppss)
(nth 8 ppss)
(and (< pos (point-max))
(memq (char-syntax (char-after pos)) '(?< ?>))
(not (eq (char-after pos) ?\n)))
(when-let (s (car (syntax-after pos)))
(or (and (/= 0 (logand (lsh 1 16) s))
(nth 4 (syntax-ppss (+ pos 2))))
(and (/= 0 (logand (lsh 1 17) s))
(nth 4 (syntax-ppss (+ pos 1))))
(and (/= 0 (logand (lsh 1 18) s))
(nth 4 (syntax-ppss (- pos 1))))
(and (/= 0 (logand (lsh 1 19) s))
(nth 4 (syntax-ppss (- pos 2)))))))))))
;;;###autoload ;;;###autoload
(defun doom-point-in-string-p (&optional pos) (defun doom-point-in-string-p (&optional pos)
@ -65,7 +51,7 @@ POS defaults to the current position."
;; REVIEW Should we cache `syntax-ppss'? ;; REVIEW Should we cache `syntax-ppss'?
(let ((pos (or pos (point)))) (let ((pos (or pos (point))))
(or (run-hook-with-args-until-success 'doom-point-in-string-functions pos) (or (run-hook-with-args-until-success 'doom-point-in-string-functions pos)
(nth 3 (syntax-ppss pos))))) (sp-point-in-string))))
;;;###autoload ;;;###autoload
(defun doom-point-in-string-or-comment-p (&optional pos) (defun doom-point-in-string-or-comment-p (&optional pos)