[elpa] master 9a2083a 27/57: Swiper should use the :re-builder argument

[Oleh Krehel]

branch: master
commit 9a2083a136618a8413aa4acbf5e4a19b2eb6cc5b
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    Swiper should use the :re-builder argument
    
    * ivy.el (ivy--transform-re): Remove defun, :re-builder should be used
      for this logic.
    (ivy--filter): Update.
    
    * swiper.el (swiper-avy): Use `ivy--regex'.
    (swiper--init): Don't set `ivy--regex-function' - it will be set by
    :re-builder.
    (swiper--re-builder): New defun.
    (swiper--ivy): Use :re-builder in call to `ivy-read'.
    (swiper--update-input-ivy): Use `ivy--regex'.
    (swiper--action): Use `ivy--regex'.
    
    Fixes #90
---
 ivy.el    |   20 +-------------------
 swiper.el |   34 +++++++++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/ivy.el b/ivy.el
index 739ebc3..ada698e 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1010,28 +1010,10 @@ Should be run via minibuffer `post-command-hook'."
        (font-lock-append-text-property 0 (length str) 'face face str))))
   str)
 
-(defvar swiper-map)
-(defvar swiper--width)
-(defun ivy--transform-re (regex)
-  "Transform REGEX into another regex.
-This is a work-around for `swiper' and line starts."
-  (if (equal (ivy-state-keymap ivy-last) swiper-map)
-      (cond
-        ((equal regex "^")
-         ".")
-        ((string-match "^\\(?:\\\\(\\)?\\(\\^\\)" regex)
-         (setq ivy--old-re "")
-         (replace-match (format "^[0-9 ]\\{%d\\}"
-                                (1+ swiper--width)) nil t regex 1))
-        (t
-         regex))
-    regex))
-
 (defun ivy--filter (name candidates)
   "Return all items that match NAME in CANDIDATES.
 CANDIDATES are assumed to be static."
-  (let* ((re (ivy--transform-re
-              (funcall ivy--regex-function name)))
+  (let* ((re (funcall ivy--regex-function name))
          (cands (cond ((and (equal re ivy--old-re)
                             ivy--old-cands)
                        ivy--old-cands)
diff --git a/swiper.el b/swiper.el
index 130b121..51af8e0 100644
--- a/swiper.el
+++ b/swiper.el
@@ -112,7 +112,7 @@
   (with-selected-window (ivy-state-window ivy-last)
     (let* ((candidates
             (avy--regex-candidates
-             (funcall ivy--regex-function ivy-text)))
+             (ivy--regex ivy-text)))
            (avy-background nil)
            (candidate
             (avy--process candidates #'avy--overlay-post)))
@@ -195,9 +195,28 @@ When non-nil, INITIAL-INPUT is the initial search pattern."
   (setq swiper--opoint (point))
   (setq swiper--len 0)
   (setq swiper--anchor (line-number-at-pos))
-  (setq swiper--window (selected-window))
-  (setq ivy--regex-function
-        (cdr (assoc t ivy-re-builders-alist))))
+  (setq swiper--window (selected-window)))
+
+(defun swiper--re-builder (str)
+  "Transform STR into a swiper regex.
+This is the regex used in the minibuffer, since the candidates
+there have line numbers. In the buffer, `ivy--regex' should be used."
+  (cond
+    ((equal str "")
+     "")
+    ((equal str "^")
+     ".")
+    ((string-match "\\^" str)
+     (setq ivy--old-re "")
+     (let ((re (ivy--regex-plus (substring str 1))))
+       (format "^[0-9][0-9 ]\\{%d\\}%s"
+               swiper--width
+               (if (zerop ivy--subexps)
+                   (prog1 (format "\\(%s\\)" re)
+                     (setq ivy--subexps 1))
+                 re))))
+    (t
+     (ivy--regex-plus str))))
 
 (defun swiper--ivy (&optional initial-input)
   "`isearch' with an overview using `ivy'.
@@ -226,7 +245,8 @@ Please remove it and update the \"swiper\" package."))
                     :preselect preselect
                     :require-match t
                     :update-fn #'swiper--update-input-ivy
-                    :unwind #'swiper--cleanup))
+                    :unwind #'swiper--cleanup
+                    :re-builder #'swiper--re-builder))
       (if (null ivy-exit)
           (goto-char swiper--opoint)
         (swiper--action res ivy-text)))))
@@ -254,7 +274,7 @@ Please remove it and update the \"swiper\" package."))
 (defun swiper--update-input-ivy ()
   "Called when `ivy' input is updated."
   (swiper--cleanup)
-  (let* ((re (funcall ivy--regex-function ivy-text))
+  (let* ((re (ivy--regex ivy-text))
          (str ivy--current)
          (num (if (string-match "^[0-9]+" str)
                   (string-to-number (match-string 0 str))
@@ -319,7 +339,7 @@ BEG and END, when specified, are the point bounds."
     (goto-char (point-min))
     (forward-line (1- (read x)))
     (re-search-forward
-     (funcall ivy--regex-function input) (line-end-position) t)
+     (ivy--regex input) (line-end-position) t)
     (swiper--ensure-visible)
     (when (/= (point) swiper--opoint)
       (unless (and transient-mark-mode mark-active)