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.

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

Various housekeeping #1804

Closed
wants to merge 5 commits into from

Conversation

@basil-conto
Copy link
Collaborator

commented Nov 15, 2018

Please review each commit in turn.

@basil-conto basil-conto force-pushed the basil-conto:blc/string branch Nov 15, 2018

@mookid

This comment has been minimized.

Copy link
Contributor

commented Nov 15, 2018

LGTM.

@basil-conto basil-conto force-pushed the basil-conto:blc/string branch 3 times, most recently Nov 20, 2018

@basil-conto basil-conto changed the title Simplify various string manipulations Various housekeeping Nov 20, 2018

@basil-conto

This comment has been minimized.

Copy link
Collaborator Author

commented Nov 20, 2018

After resolving the merge conflict on this branch, I took the liberty of extending it with a few more commits. Sorry about the hassle.

@nxtr

This comment has been minimized.

Copy link
Contributor

commented Nov 20, 2018

LGTM

basil-conto added 5 commits Nov 15, 2018
Simplify various string manipulations
counsel.el (counsel-git-worktree-parse-root):
Don't unnecessarily modify match data.
swiper.el (swiper--re-builder):
ivy.el (ivy-partial-or-done, ivy--regex-plus, ivy--exhibit)
(ivy--prefix-sort, ivy-sort-function-buffer):
Simplify prefix string comparison.
(ivy--regex): Do not modify match data.  Use shy grouping where
applicable.  Check for end-of-string instead of end-of-line.
(ivy--remove-prefix): New function.
(ivy-partial, ivy--recompute-index, ivy--highlight-fuzzy): Use it.
ivy-overlay.el:
Avoid checking emacs-version and loading subr-x at runtime.
(ivy-display-function-overlay): Use ivy--remove-prefix.
Various minor simplifications
ivy.el (ivy-partial, ivy--reset-state, ivy-completing-read):
Simplify.
(ivy-immediate-done): Flatten conditional logic re: #1719.
(ivy-read): Avoid traversing entire candidate list.
(ivy-shrink-after-dispatching, ivy-minibuffer-shrink)
(ivy--get-window):
swiper.el (swiper--avy-candidate):
Simplify usage of (selected-window).
(swiper--ivy): De Morgan.
(swiper--face-matcher): Compute string length a single time.
Fix ivy-re-to-str usage
ivy.el (ivy-generic-regex-to-str):
Obsolete in favour of duplicate ivy-re-to-str.
(ivy--filter, ivy-sort-function-buffer):
counsel.el (counsel-git-grep-occur):
swiper.el (swiper-all-function): Use ivy-re-to-str.
ivy.el: Remove redundant :group tags
(ivy-sort-functions-alist, ivy-fixed-height-minibuffer):
Remove redundant custom :group tag from user options.
ivy.el: DRY for determining minibuffer face
(ivy--minibuffer-face): New function.
(ivy--flx-propertize, ivy--highlight-ignore-order)
(ivy--highlight-default): Use it.

@basil-conto basil-conto force-pushed the basil-conto:blc/string branch to 85984eb Nov 20, 2018

@abo-abo abo-abo closed this in 87b91bf Nov 20, 2018

@abo-abo

This comment has been minimized.

Copy link
Owner

commented Nov 20, 2018

Thanks!

@basil-conto basil-conto deleted the basil-conto:blc/string branch Nov 20, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.