Fix describe-function / -variable "C-." interaction

[gnu-emacs-elpa] / counsel.el

diff --git a/counsel.el b/counsel.el
index ee9535abfc031308dde670df19858a79f3c36be2..7ad7787ff92f6df90543efe81703b83ea40a6e1d 100644 (file)
--- a/counsel.el
+++ b/counsel.el
@@ -5,7 +5,7 @@
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
 ;; URL: https://github.com/abo-abo/swiper
 ;; Version: 0.1.0
-;; Package-Requires: ((emacs "24.1") (swiper "0.2.1"))
+;; Package-Requires: ((emacs "24.1") (swiper "0.3.0"))
 ;; Keywords: completion, matching
 
 ;; This file is part of GNU Emacs.
@@ -32,7 +32,7 @@
 
 ;;; Code:
 
-(require 'ivy)
+(require 'swiper)
 
 (defun counsel-el ()
   "Elisp completion at point."
@@ -73,6 +73,7 @@
          (enable-recursive-minibuffers t)
          (preselect (thing-at-point 'symbol))
          val)
+     (setq ivy--action nil)
      (setq val (ivy-read
                 (if (symbolp v)
                     (format
@@ -85,11 +86,13 @@
                                (and (boundp vv) (not (keywordp vv))))
                        (push (symbol-name vv) cands))))
                   cands)
-                nil nil counsel-describe-map preselect))
+                nil nil counsel-describe-map preselect
+                nil t))
      (list (if (equal val "")
                v
              (intern val)))))
-  (describe-variable variable buffer frame))
+  (unless (eq ivy--action 'counsel--find-symbol)
+    (describe-variable variable buffer frame)))
 
 (defun counsel-describe-function (function)
   "Forward to (`describe-function' FUNCTION) with ivy completion."
@@ -98,6 +101,7 @@
          (enable-recursive-minibuffers t)
          (preselect (thing-at-point 'symbol))
          val)
+     (setq ivy--action nil)
      (setq val (ivy-read (if fn
                              (format "Describe function (default %s): " fn)
                            "Describe function: ")
@@ -107,10 +111,12 @@
                               (when (fboundp x)
                                 (push (symbol-name x) cands))))
                            cands)
-                         nil nil counsel-describe-map preselect))
+                         nil nil counsel-describe-map preselect
+                         nil t))
      (list (if (equal val "")
                fn (intern val)))))
-  (describe-function function))
+  (unless (eq ivy--action 'counsel--find-symbol)
+    (describe-function function)))
 
 (defvar info-lookup-mode)
 (declare-function info-lookup->completions "info-look")
@@ -175,26 +181,72 @@
     (when file
       (find-file file))))
 
+(defun counsel-git-grep-count (str)
+  "Quickly count the amount of git grep STR matches."
+  (let ((out (shell-command-to-string
+              (format "git grep -c '%s' | sed 's/.*:\\(.*\\)/\\1/g' | awk '{s+=$1} END {print s}'"
+                      (ivy--regex str)))))
+    (string-to-number out)))
+
+(defvar counsel--git-grep-count nil
+  "Store the line count in current repository.")
+
 (defun counsel-git-grep-function (string &optional _pred &rest _unused)
   "Grep in the current git repository for STRING."
-  (split-string
-   (shell-command-to-string
-    (format "git --no-pager grep --full-name -n --no-color -i -e \"%s\"" string))
-   "\n"
-   t))
+  (if (and (> counsel--git-grep-count 20000)
+           (< (length string) 3))
+      (progn
+        (setq ivy--full-length counsel--git-grep-count)
+        (list ""
+              (format "%d chars more" (- 3 (length ivy-text)))))
+    (let ((cmd (format "git --no-pager grep --full-name -n --no-color -i -e \"%s\""
+                       (ivy--regex string t)))
+          res)
+      (if (<= counsel--git-grep-count 20000)
+          (progn
+            (setq res (shell-command-to-string cmd))
+            (setq ivy--full-length nil))
+        (setq res (shell-command-to-string (concat cmd " | head -n 5000")))
+        (setq ivy--full-length (counsel-git-grep-count ivy-text)))
+      (split-string res "\n" t))))
 
 (defun counsel-git-grep ()
   "Grep for a string in the current git repository."
   (interactive)
-  (let ((default-directory (locate-dominating-file
-                             default-directory ".git"))
-        (val (ivy-read "pattern: " 'counsel-git-grep-function))
-        lst)
+  (unwind-protect
+       (let* ((counsel--git-grep-count (counsel-git-grep-count ""))
+              (ivy--dynamic-function (when (> counsel--git-grep-count 20000)
+                                       'counsel-git-grep-function))
+              (git-dir (locate-dominating-file
+                        default-directory ".git"))
+              (ivy--persistent-action (lambda (x)
+                                        (setq lst (split-string x ":"))
+                                        (find-file (expand-file-name (car lst) git-dir))
+                                        (goto-char (point-min))
+                                        (forward-line (1- (string-to-number (cadr lst))))
+                                        (setq swiper--window (selected-window))
+                                        (swiper--cleanup)
+                                        (swiper--add-overlays (ivy--regex ivy-text))))
+              (val (ivy-read "pattern: " 'counsel-git-grep-function))
+              lst)
+         (when val
+           (funcall ivy--persistent-action val)))
+    (swiper--cleanup)))
+
+(defun counsel-locate-function (str &rest _u)
+  (if (< (length str) 3)
+      (list ""
+            (format "%d chars more" (- 3 (length ivy-text))))
+    (split-string
+     (shell-command-to-string (concat "locate -i -l 20 --regex " (ivy--regex str))) "\n" t)))
+
+(defun counsel-locate ()
+  "Call locate."
+  (interactive)
+  (let* ((ivy--dynamic-function 'counsel-locate-function)
+         (val (ivy-read "pattern: " 'counsel-locate-function)))
     (when val
-      (setq lst (split-string val ":"))
-      (find-file (car lst))
-      (goto-char (point-min))
-      (forward-line (1- (string-to-number (cadr lst)))))))
+      (find-file val))))
 
 (defun counsel--generic (completion-fn)
   "Complete thing at point with COMPLETION-FN."