emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/rainbow-delimiters a802a6c823 156/188: Refactor the code,


From: ELPA Syncer
Subject: [nongnu] elpa/rainbow-delimiters a802a6c823 156/188: Refactor the code, no functional changes.
Date: Sat, 1 Jan 2022 00:59:01 -0500 (EST)

branch: elpa/rainbow-delimiters
commit a802a6c823f7101ab10f9e060a4fdac5c5ffc170
Author: Fanael Linithien <fanael4@gmail.com>
Commit: Fanael Linithien <fanael4@gmail.com>

    Refactor the code, no functional changes.
    
    Use cond instead of unless + if to reduce indentation, extract a common
    subexpression to a variable, introduce a variable so a multiline function
    call can be written in a single line.
---
 rainbow-delimiters.el | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/rainbow-delimiters.el b/rainbow-delimiters.el
index 6be845f1e1..837407488c 100644
--- a/rainbow-delimiters.el
+++ b/rainbow-delimiters.el
@@ -229,22 +229,20 @@ Used by font-lock for dynamic highlighting."
         (setq ppss (save-excursion
                      (parse-partial-sexp last-ppss-pos delim-pos nil nil 
ppss)))
         (setq last-ppss-pos delim-pos)
-        (unless (rainbow-delimiters--char-ineligible-p delim-pos ppss (car 
delim-syntax))
-          (if (= 4 (logand #xFFFF (car delim-syntax)))
-              (progn
-                (setq depth (1+ depth))
-                (rainbow-delimiters--apply-color delim-pos
-                                                 depth
-                                                 t))
+        (let ((delim-syntax-code (car delim-syntax)))
+          (cond
+           ((rainbow-delimiters--char-ineligible-p delim-pos ppss 
delim-syntax-code)
+            nil)
+           ((= 4 (logand #xFFFF delim-syntax-code))
+            (setq depth (1+ depth))
+            (rainbow-delimiters--apply-color delim-pos depth t))
+           (t
             ;; Not an opening delimiter, so it's a closing delimiter.
-            (let ((matching-opening-delim (char-after (nth 1 ppss))))
-              (rainbow-delimiters--apply-color delim-pos
-                                               depth
-                                               (eq (cdr delim-syntax)
-                                                   matching-opening-delim))
+            (let ((matches-p (eq (cdr delim-syntax) (char-after (nth 1 
ppss)))))
+              (rainbow-delimiters--apply-color delim-pos depth matches-p)
               ;; Don't let `depth' go negative, even if there's an unmatched
               ;; delimiter.
-              (setq depth (max 0 (1- depth)))))))))
+              (setq depth (max 0 (1- depth))))))))))
   ;; We already fontified the delimiters, tell font-lock there's nothing more
   ;; to do.
   nil)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]