[elpa] master f628eb3 210/399: swiper.el (swiper-isearch-symbol-at-point): Add

[Oleh Krehel]

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

    swiper.el (swiper-isearch-symbol-at-point): Add
    
    Fixes #2025
    Re #2029
---
 swiper.el | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/swiper.el b/swiper.el
index ef45500..64ea999 100644
--- a/swiper.el
+++ b/swiper.el
@@ -1259,6 +1259,30 @@ come back to the same place as when \"a\" was initially 
entered.")
           (swiper--add-cursor-overlay)))
     (swiper--cleanup)))
 
+(defun swiper-isearch-symbol-at-point ()
+  "Insert `symbol-at-point' into the minibuffer of `swiper-isearch'.
+When not running `swiper-isearch' already, start it."
+  (interactive)
+  (if (window-minibuffer-p)
+      (let (bnd str)
+        (with-ivy-window
+          (setq bnd (bounds-of-thing-at-point 'symbol))
+          (setq str (buffer-substring-no-properties (car bnd) (cdr bnd))))
+        (setq swiper--isearch-point-history
+              (list (cons "" (car bnd))))
+        (insert str))
+    (let ((bnd (bounds-of-thing-at-point 'symbol)))
+      (when bnd
+        (goto-char (car bnd))
+        (swiper-isearch (buffer-substring-no-properties (car bnd) (cdr 
bnd)))))))
+
+(defvar swiper-isearch-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map swiper-map)
+    (define-key map (kbd "M-n") 'swiper-isearch-symbol-at-point)
+    map)
+  "Keymap for `swiper-isearch'.")
+
 ;;;###autoload
 (defun swiper-isearch (&optional initial-input)
   "A `swiper' that's not line-based."
@@ -1266,9 +1290,7 @@ come back to the same place as when \"a\" was initially 
entered.")
   (swiper--init)
   (setq swiper--isearch-point-history
         (list
-         (cons "" (if executing-kbd-macro
-                      (point)
-                    (line-beginning-position)))))
+         (cons "" (point))))
   (let ((ivy-fixed-height-minibuffer t)
         (cursor-in-non-selected-windows nil)
         (swiper-min-highlight 1)
@@ -1280,7 +1302,7 @@ come back to the same place as when \"a\" was initially 
entered.")
                  "Swiper: "
                  #'swiper-isearch-function
                  :initial-input initial-input
-                 :keymap swiper-map
+                 :keymap swiper-isearch-map
                  :dynamic-collection t
                  :require-match t
                  :action #'swiper-isearch-action