Add precise preselect for swiper with visual-line-mode

* swiper.el (swiper--ivy): Use `count-screen-lines' to calculate the
  visual line number.

Fixes #291

diff --git a/swiper.el b/swiper.el
index b9722d45559aa35f83e2fc443e98fa324924f443..216a50a0e39a2995d4c3d568779a9394220b1763 100644 (file)
--- a/swiper.el
+++ b/swiper.el
@@ -342,9 +342,9 @@ When non-nil, INITIAL-INPUT is the initial search pattern."
   (let ((candidates (swiper--candidates))
         (preselect
          (if (bound-and-true-p visual-line-mode)
-             (concat " " (buffer-substring-no-properties
-                          (save-excursion (beginning-of-visual-line) (point))
-                          (save-excursion (end-of-visual-line) (point))))
+             (count-screen-lines
+              (point-min)
+              (save-excursion (beginning-of-visual-line) (point)))
            (1- (line-number-at-pos))))
         (minibuffer-allow-text-properties t))
     (unwind-protect