mirror of
https://github.com/jojojames/evil-collection.git
synced 2024-07-16 10:27:35 +02:00
96 lines
3.7 KiB
EmacsLisp
96 lines
3.7 KiB
EmacsLisp
;;; evil-collection-consult.el --- Evil bindings for consult -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 2017 James Nguyen
|
|
|
|
;; Author: James Nguyen <james@jojojames.com>
|
|
;; Maintainer: James Nguyen <james@jojojames.com>
|
|
;; Pierre Neidhardt <mail@ambrevar.xyz>
|
|
;; URL: https://github.com/emacs-evil/evil-collection
|
|
;; Version: 0.0.1
|
|
;; Package-Requires: ((emacs "25.1"))
|
|
;; Keywords: evil, consult, tools
|
|
|
|
;; This program is free software; you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; This program is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
;; Evil bindings for `consult'.
|
|
|
|
;;; Code:
|
|
(require 'evil-collection)
|
|
(require 'consult nil t)
|
|
|
|
(defvar consult-line-numbers-widen)
|
|
(declare-function consult--forbid-minibuffer "consult")
|
|
(declare-function consult--fontify-all "consult")
|
|
(declare-function consult--in-range-p "consult")
|
|
(declare-function consult--line-with-cursor "consult")
|
|
(declare-function consult--remove-dups "consult")
|
|
(declare-function consult--add-line-number "consult")
|
|
(declare-function consult--mark-candidates "consult")
|
|
(declare-function consult-mark "consult")
|
|
|
|
(defun evil-collection-consult-set-bindings ()
|
|
"Set the bindings."
|
|
(evil-set-command-property 'consult-outline :jump t)
|
|
(evil-set-command-property 'consult-mark :jump t)
|
|
(evil-set-command-property 'consult-line :jump t))
|
|
|
|
(defun evil-collection-consult-evil-mark-ring ()
|
|
"Return alist of char & marker for evil markers in current buffer."
|
|
(sort (cl-remove-if (lambda (elem)
|
|
(or (not (evil-global-marker-p (car elem)))
|
|
(not (markerp (cdr-safe elem)))))
|
|
evil-markers-alist)
|
|
#'car-less-than-car))
|
|
|
|
(defun evil-collection-consult--mark-candidates ()
|
|
"Return alist of lines containing markers.
|
|
The alist contains (string . position) pairs."
|
|
(consult--forbid-minibuffer)
|
|
(unless (evil-collection-consult-evil-mark-ring)
|
|
(user-error "No marks"))
|
|
(consult--fontify-all)
|
|
(let* ((max-line 0)
|
|
(candidates))
|
|
(save-excursion
|
|
(dolist (marker (evil-collection-consult-evil-mark-ring))
|
|
(let ((pos (marker-position (cdr marker))))
|
|
(when (consult--in-range-p pos)
|
|
(goto-char pos)
|
|
(let ((line (line-number-at-pos pos consult-line-numbers-widen)))
|
|
(setq max-line (max line max-line))
|
|
(push (list (cdr marker) line (format "%s: %s" (char-to-string (car marker))
|
|
(consult--line-with-cursor (cdr marker))))
|
|
candidates))))))
|
|
(nreverse (consult--remove-dups (consult--add-line-number max-line candidates)))))
|
|
|
|
(defun evil-collection-consult-mark ()
|
|
"Jump to an evil marker in the current buffer."
|
|
(interactive)
|
|
(unwind-protect
|
|
(progn
|
|
(advice-add #'consult--mark-candidates :override
|
|
#'evil-collection-consult--mark-candidates)
|
|
(consult-mark))
|
|
(advice-remove #'consult--mark-candidates
|
|
#'evil-collection-consult--mark-candidates)))
|
|
|
|
;;;###autoload
|
|
(defun evil-collection-consult-setup ()
|
|
"Set up `evil' bindings for `consult'."
|
|
(evil-collection-consult-set-bindings))
|
|
|
|
(provide 'evil-collection-consult)
|
|
;;; evil-collection-consult.el ends here
|