mirror of
https://github.com/vale981/boon
synced 2025-03-04 17:11:40 -05:00
attempt to fix the regex case-fold-search
This commit is contained in:
parent
35a01450a4
commit
73f40557fa
1 changed files with 13 additions and 3 deletions
|
@ -30,7 +30,8 @@ the regexp."
|
||||||
(message "Wrapping around")
|
(message "Wrapping around")
|
||||||
(if forward (point-min) (point-max))))
|
(if forward (point-min) (point-max))))
|
||||||
(setq boon-search-success nil)
|
(setq boon-search-success nil)
|
||||||
(if forward (re-search-forward boon-regexp) (re-search-backward boon-regexp))
|
(let ((case-fold-search nil)) ;; because hi-lock is case-sensitive
|
||||||
|
(if forward (re-search-forward boon-regexp) (re-search-backward boon-regexp)))
|
||||||
;; If search fails an exception is thrown and this won't be set.
|
;; If search fails an exception is thrown and this won't be set.
|
||||||
(setq boon-search-success t))
|
(setq boon-search-success t))
|
||||||
(goto-char (match-beginning 0)))
|
(goto-char (match-beginning 0)))
|
||||||
|
@ -78,7 +79,16 @@ the regexp."
|
||||||
string ""))
|
string ""))
|
||||||
(t (regexp-quote string)))))
|
(t (regexp-quote string)))))
|
||||||
|
|
||||||
|
(defun boon-case-fold-regex (regex)
|
||||||
|
"Make REGEX case-insensitive, depending on `case-fold-search'.
|
||||||
|
This is an extremely bugged first draft."
|
||||||
|
(if (not case-fold-search) regex
|
||||||
|
(replace-regexp-in-string
|
||||||
|
"[[:alpha:]]"
|
||||||
|
(lambda (m) (format "[%s%s]"
|
||||||
|
(upcase (match-string 0 m))
|
||||||
|
(match-string 0 m)))
|
||||||
|
regex)))
|
||||||
|
|
||||||
(defun boon-highlight-regexp ()
|
(defun boon-highlight-regexp ()
|
||||||
"Make sure boon-regexp is highlighted."
|
"Make sure boon-regexp is highlighted."
|
||||||
|
@ -112,7 +122,7 @@ the regexp."
|
||||||
|
|
||||||
(defadvice swiper--action (after boon-swiper-set-search activate compile)
|
(defadvice swiper--action (after boon-swiper-set-search activate compile)
|
||||||
"After swiper, highlight the search term and set it as boon current regexp."
|
"After swiper, highlight the search term and set it as boon current regexp."
|
||||||
(boon-set-search-regexp (car regexp-search-ring)))
|
(boon-set-search-regexp (boon-case-fold-regex (car regexp-search-ring))))
|
||||||
|
|
||||||
(provide 'boon-search)
|
(provide 'boon-search)
|
||||||
;;; boon-search.el ends here
|
;;; boon-search.el ends here
|
||||||
|
|
Loading…
Add table
Reference in a new issue