From 14729d21d14771b6ec969ef25878f350a27439d4 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 17 Sep 2021 09:10:37 +0200
Subject: [PATCH] dev(ci): refactor commit message reader for linter

---
 core/cli/ci.el | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/core/cli/ci.el b/core/cli/ci.el
index 91222b832..f859df188 100644
--- a/core/cli/ci.el
+++ b/core/cli/ci.el
@@ -31,6 +31,10 @@
 ;;
 ;;; Git hooks
 
+(defvar doom-cli-commit-ref-types '("Fix" "Ref" "Close" "Revert"))
+
+(defvar doom-cli-commit-ref-git-types '("Co-authored-by:" "Signed-off-by:"))
+
 (defvar doom-cli-commit-rules
   (list (fn! (&key subject)
           (when (<= (length subject) 10)
@@ -162,7 +166,7 @@
           (catch 'found
             (dolist (line refs)
               (cl-destructuring-bind (type . ref) (split-string line " +")
-                (unless (member type '("Co-authored-by:" "Signed-off-by:"))
+                (unless (member type doom-cli-commit-ref-git-types)
                   (setq ref (string-join ref " "))
                   (or (string-match "^\\(https?://.+\\|[^/]+/[^/]+\\)?\\(#[0-9]+\\|@[a-z0-9]+\\)" ref)
                       (string-match "^https?://" ref)
@@ -205,27 +209,19 @@
        (let (subject body refs summary type scopes bang refs errors warnings)
          (with-temp-buffer
            (save-excursion (insert (cdr commit)))
-           (setq subject (buffer-substring (point-min) (line-end-position))
-                 body (buffer-substring
-                       (line-beginning-position 3)
-                       (save-excursion
-                         (or (and (re-search-forward (format "\n\n%s "
-                                                             (regexp-opt '("Co-authored-by:" "Signed-off-by:" "Fix" "Ref" "Close" "Revert")
-                                                                         t))
-                                                     nil t)
-                                  (match-beginning 1))
-                             (point-max))))
-                 refs (split-string
-                       (save-excursion
-                         (buffer-substring
-                          (or (and (re-search-forward (format "\n\n%s "
-                                                              (regexp-opt '("Co-authored-by:" "Signed-off-by:" "Fix" "Ref" "Close" "Revert")
-                                                                          t))
-                                                      nil t)
-                                   (match-beginning 1))
-                              (point-max))
-                          (point-max)))
-                       "\n" t))
+           (let ((end (save-excursion
+                        (or (and (re-search-forward
+                                  (format "\n\n%s "
+                                          (regexp-opt (append doom-cli-commit-ref-types
+                                                              doom-cli-commit-ref-git-types)
+                                                      t))
+                                  nil t)
+                                 (match-beginning 1))
+                            (point-max)))))
+             (setq subject (buffer-substring (point-min) (line-end-position))
+                   body (buffer-substring (line-beginning-position 3) end)
+                   refs (split-string (buffer-substring end (point-max))
+                                      "\n" t)))
            (save-match-data
              (when (looking-at "^\\([a-zA-Z0-9_-]+\\)\\(!?\\)\\(?:(\\([^)]+\\))\\)?: \\([^\n]+\\)")
                (setq type (intern (match-string 1))