From 8ff15c2aeb9e8e8d9e9079aa4b2910fee421bf3e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 3 Jan 2020 02:44:29 -0500 Subject: [PATCH] Optimize doom-point-in-*-p functions Since we won't be dumping smartparens just yet, use it for now. --- core/autoload/text.el | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/core/autoload/text.el b/core/autoload/text.el index 36f7b989f..623fc3cea 100644 --- a/core/autoload/text.el +++ b/core/autoload/text.el @@ -43,21 +43,7 @@ lines, above and below, with only whitespace in between." POS defaults to the current position." (let ((pos (or pos (point)))) (or (run-hook-with-args-until-success 'doom-point-in-comment-functions pos) - (let ((ppss (syntax-ppss 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))))))))))) + (sp-point-in-comment pos)))) ;;;###autoload (defun doom-point-in-string-p (&optional pos) @@ -65,7 +51,7 @@ POS defaults to the current position." ;; REVIEW Should we cache `syntax-ppss'? (let ((pos (or pos (point)))) (or (run-hook-with-args-until-success 'doom-point-in-string-functions pos) - (nth 3 (syntax-ppss pos))))) + (sp-point-in-string)))) ;;;###autoload (defun doom-point-in-string-or-comment-p (&optional pos)