Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct highlighting for multiple regexps #1587

Closed
wants to merge 1 commit into from
Closed

Correct highlighting for multiple regexps #1587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 24 additions & 20 deletions ivy.el
View file
Open in desktop
Expand Up @@ -3315,26 +3315,30 @@ FACE is the face to apply to STR."
(string-match "^[^:]+:[^:]+:" str))
(match-end 0)
0))
(re (ivy-generic-regex-to-str ivy--old-re)))
(ignore-errors
(while (and (string-match re str start)
(> (- (match-end 0) (match-beginning 0)) 0))
(setq start (match-end 0))
(let ((i 0))
(while (<= i ivy--subexps)
(let ((face
(cond ((zerop ivy--subexps)
(cadr ivy-minibuffer-faces))
((zerop i)
(car ivy-minibuffer-faces))
(t
(nth (1+ (mod (+ i 2)
(1- (length ivy-minibuffer-faces))))
ivy-minibuffer-faces)))))
(ivy-add-face-text-property
(match-beginning i) (match-end i)
face str))
(cl-incf i))))))
(regexps
(if (listp ivy--old-re)
(mapcar #'car (cl-remove-if-not #'cdr ivy--old-re))
(list ivy--old-re))))
(dolist (re regexps)
(ignore-errors
(while (and (string-match re str start)
(> (- (match-end 0) (match-beginning 0)) 0))
(setq start (match-end 0))
(let ((i 0))
(while (<= i ivy--subexps)
(let ((face
(cond ((zerop ivy--subexps)
(cadr ivy-minibuffer-faces))
((zerop i)
(car ivy-minibuffer-faces))
(t
(nth (1+ (mod (+ i 2)
(1- (length ivy-minibuffer-faces))))
ivy-minibuffer-faces)))))
(ivy-add-face-text-property
(match-beginning i) (match-end i)
face str))
(cl-incf i)))))))
str)

(defun ivy--format-minibuffer-line (str)
Expand Down
82 changes: 43 additions & 39 deletions swiper.el
View file
Open in desktop
Expand Up @@ -620,45 +620,49 @@ Matched candidates should have `swiper-invocation-face'."
(with-ivy-window
(swiper--cleanup)
(when (> (length (ivy-state-current ivy-last)) 0)
(let* ((re (funcall ivy--regex-function ivy-text))
(re (if (stringp re) re (caar re)))
(re (replace-regexp-in-string
" " "\t"
re))
(str (get-text-property 0 'swiper-line-number (ivy-state-current ivy-last)))
(num (if (string-match "^[0-9]+" str)
(string-to-number (match-string 0 str))
0)))
(unless (memq this-command '(ivy-yank-word
scroll-other-window))
(when (cl-plusp num)
(unless (if swiper--current-line
(eq swiper--current-line num)
(eq (line-number-at-pos) num))
(goto-char swiper--point-min)
(if swiper-use-visual-line
(line-move (1- num))
(forward-line (1- num))))
(if (and (equal ivy-text "")
(>= swiper--opoint (line-beginning-position))
(<= swiper--opoint (line-end-position)))
(goto-char swiper--opoint)
(if (eq swiper--current-line num)
(when swiper--current-match-start
(goto-char swiper--current-match-start))
(setq swiper--current-line num))
(when (re-search-forward re (line-end-position) t)
(setq swiper--current-match-start (match-beginning 0))))
(isearch-range-invisible (line-beginning-position)
(line-end-position))
(unless (and (>= (point) (window-start))
(<= (point) (window-end (ivy-state-window ivy-last) t)))
(recenter))
(setq swiper--current-window-start (window-start))))
(swiper--add-overlays
re
(max (window-start) swiper--point-min)
(min (window-end (selected-window) t) swiper--point-max))))))
(let* ((regexp-or-regexps (funcall ivy--regex-function ivy-text))
(regexps
(if (listp regexp-or-regexps)
(mapcar #'car (cl-remove-if-not #'cdr regexp-or-regexps))
(list regexp-or-regexps))))
(dolist (re regexps)
(let* ((re (replace-regexp-in-string
" " "\t"
re))
(str (get-text-property 0 'swiper-line-number (ivy-state-current ivy-last)))
(num (if (string-match "^[0-9]+" str)
(string-to-number (match-string 0 str))
0)))
(unless (memq this-command '(ivy-yank-word
scroll-other-window))
(when (cl-plusp num)
(unless (if swiper--current-line
(eq swiper--current-line num)
(eq (line-number-at-pos) num))
(goto-char swiper--point-min)
(if swiper-use-visual-line
(line-move (1- num))
(forward-line (1- num))))
(if (and (equal ivy-text "")
(>= swiper--opoint (line-beginning-position))
(<= swiper--opoint (line-end-position)))
(goto-char swiper--opoint)
(if (eq swiper--current-line num)
(when swiper--current-match-start
(goto-char swiper--current-match-start))
(setq swiper--current-line num))
(when (re-search-forward re (line-end-position) t)
(setq swiper--current-match-start (match-beginning 0))))
(isearch-range-invisible (line-beginning-position)
(line-end-position))
(unless (and (>= (point) (window-start))
(<= (point) (window-end (ivy-state-window ivy-last) t)))
(recenter))
(setq swiper--current-window-start (window-start))))
(swiper--add-overlays
re
(max (window-start) swiper--point-min)
(min (window-end (selected-window) t) swiper--point-max))))))))

(defun swiper--add-overlays (re &optional beg end wnd)
"Add overlays for RE regexp in visible part of the current buffer.
Expand Down