Skip to content

Removed dependency on s.el. #32

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

Open
amno1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed dependency on s.el. #32

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions elisp-refs.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
;;; Code:

(require 'dash)
(require 's)
(require 'format)
(eval-when-compile (require 'cl-lib))
(eval-when-compile (require 'subr-x))

;;; Internal

Expand All @@ -52,7 +52,7 @@
(push (format "%d" number) parts)
(concat
(if (< integer 0) "-" "")
(s-join "," parts))))
(string-join parts ","))))

(defsubst elisp-refs--start-pos (end-pos)
"Find the start position of form ending at END-POS
Expand Down Expand Up @@ -398,14 +398,14 @@ don't want to create lots of temporary buffers.")
"Replace tabs in STRING with spaces."
;; This is important for unindenting, as we may unindent by less
;; than one whole tab.
(s-replace "\t" (s-repeat tab-width " ") string))
(replace-regexp-in-string "\t" (make-string tab-width ?\s) string))

(defun elisp-refs--lines (string)
"Return a list of all the lines in STRING.
'a\nb' -> ('a\n' 'b')"
(let ((lines nil))
(while (> (length string) 0)
(let ((index (s-index-of "\n" string)))
(let ((index (string-match-p "\n" string)))
(if index
(progn
(push (substring string 0 (1+ index)) lines)
Expand All @@ -427,11 +427,11 @@ at least one line has no indent.

STRING should have a 'elisp-refs-start-pos property. The returned
string will have this property updated to reflect the unindent."
(let* ((lines (s-lines string))
;; Get the leading whitespace for each line.
(indents (--map (car (s-match (rx bos (+ whitespace)) it))
lines))
(min-indent (-min (--map (length it) indents))))
(let* ((lines (split-string string "\n"))
(min-indent most-positive-fixnum) (indent 0))
Copy link
Copy Markdown

@basil-conto basil-conto Sep 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Elisp has bignums now so I would find it more elegant to do away with the arbitrary fixnum limit, e.g. by continuing to use Dash helpers (min-by, reduce), or by using nil or similar as an initial value.

  • The indent variable can be moved into the loop to avoid the need for setq (which should make it slightly more efficient too).

(dolist (line lines)
(setq indent (or (string-match-p "[^[:blank:]]" line) 0))
Copy link
Copy Markdown

@basil-conto basil-conto Sep 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove the use of rx?

(if (> min-indent indent) (setq min-indent indent)))
(propertize
(elisp-refs--map-lines
string
Expand Down Expand Up @@ -542,8 +542,13 @@ KIND should be 'function, 'macro, 'variable, 'special or 'symbol."
(elisp-refs--pluralize searched-file-count "loaded file")
(elisp-refs--path-button (file-name-as-directory prefix)))
(format "Searched all %s loaded in Emacs."
(elisp-refs--pluralize searched-file-count "file")))))
(s-word-wrap 70 (format "%s %s" found-str searched-str))))
(elisp-refs--pluralize searched-file-count
"file")))))
(with-temp-buffer
(insert found-str " " searched-str)
(let ((fill-column 70))
(fill-region (point-min) (point-max)))
(buffer-string))))

;; TODO: if we have multiple matches on one line, we repeatedly show
;; that line. That's slightly confusing.
Expand Down Expand Up @@ -628,7 +633,7 @@ MATCH-FN should return a list where each element takes the form:
\(form start-pos end-pos)."
(let* ((loaded-paths (elisp-refs--loaded-paths))
(matching-paths (if path-prefix
(--filter (s-starts-with? path-prefix it) loaded-paths)
(--filter (string-prefix-p path-prefix it) loaded-paths)
loaded-paths))
(loaded-src-bufs (mapcar #'elisp-refs--contents-buffer matching-paths)))
;; Use unwind-protect to ensure we always cleanup temporary
Expand Down