Simplify helm-boring-file-regexp-list settings (#2009)

thierryvolpiatto · thierryvolpiatto · commit a9bca00ce56b · 2025-04-11T07:45:35.000+02:00
diff --git a/helm-lib.el b/helm-lib.el
@@ -114,28 +114,26 @@ convenient to use a simple boolean value here."
 (defun helm-ff--setup-boring-regex (var val)
   (set var val)
   (setq helm-ff--boring-regexp
-          (cl-loop with last = (car (last val))
-                   for r in (butlast val)
-                   if (string-match "\\$\\'" r)
-                   concat (concat r "\\|") into result
-                   else concat (concat r "$\\|") into result
-                   finally return
-                   (concat result last
-                           (if (string-match "\\$\\'" last) "" "$")))))
+        (cl-loop for r on val
+                 if (cdr r)
+                 concat (concat (car r) "\\|")
+                 else concat (car r))))
 
 (defcustom helm-boring-file-regexp-list
   (mapcar (lambda (f)
             (let ((rgx (regexp-quote f)))
               (if (string-match-p "[^/]$" f)
                   ;; files: e.g .o => \\.o$
                   (concat rgx "$")
-                ;; directories: e.g .git/ => \.git\\(/\\|$\\)
-                (concat (substring rgx 0 -1) "\\(/\\|$\\)"))))
+                ;; To not ignore files with same prefix as directory names
+                ;; (bug#2009) use e.g. .git/ => \.git\?$.
+                ;; See also PR in bug#2012.
+                (concat rgx "?$"))))
           completion-ignored-extensions)
   "A list of regexps matching boring files.
 
 This list is build by default on `completion-ignored-extensions'.
-The directory names should end with \"/?\" e.g. \"\\.git/?\" and
+The directory names should end with \"/?$\" e.g. \"\\.git/?$\" and
 the file names should end with \"$\" e.g. \"\\.o$\".
 
 These regexps may be used to match the entire path, not just the
