Skip to content

Fix f-uniquify-alist infinite loop with `projectile-current-project… #63

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
FrancisMurillo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix f-uniquify-alist infinite loop with `projectile-current-project… #63

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions f.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,20 @@ ending slash."
(defun f--uniquify (paths)
"Helper for `f-uniquify' and `f-uniquify-alist'."
(let* ((files-length (length paths))
(uniq-filenames (--map (cons it (f-filename it)) paths))
(path-name (lambda (path)
(let ((base-name (f-filename path)))
(if (string-equal (f-path-separator) (s-right 1 path))
(concat base-name (f-path-separator))
base-name))))
(uniq-filenames (--map (cons it (funcall path-name it)) paths))
(uniq-filenames-next (-group-by 'cdr uniq-filenames)))
(while (/= files-length (length uniq-filenames-next))
(setq uniq-filenames-next
(-group-by 'cdr
(--mapcat
(let ((conf-files (cdr it)))
(if (> (length conf-files) 1)
(--map (cons (car it) (concat (f-filename (s-chop-suffix (cdr it) (car it))) (f-path-separator) (cdr it))) conf-files)
(--map (cons (car it) (concat (funcall path-name (s-chop-suffix (cdr it) (car it))) (cdr it))) conf-files)
conf-files))
uniq-filenames-next))))
uniq-filenames-next))
Expand Down
3 changes: 3 additions & 0 deletions test/f-paths-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,9 @@
(ert-deftest f-uniquify-alist/single-conflict-shared-subpath ()
(should (equal (f-uniquify-alist '("/foo/bar" "/www/bar" "/www/bar/quux")) '(("/foo/bar" . "foo/bar") ("/www/bar" . "www/bar") ("/www/bar/quux" . "quux")))))

(ert-deftest f-uniquify-alist/projectile-dirs ()
(should (equal (f-uniquify-alist '("/bar/foo/" "/baz/foo/")) '(("/bar/foo/" . "bar/foo/") ("/baz/foo/" . "baz/foo/")))))

(ert-deftest f-uniquify-alist/recursive-conflict ()
(should (equal (f-uniquify-alist '("/foo/bar" "/foo/baz" "/home/www/bar" "/home/www/baz" "/var/foo" "/opt/foo/www/baz"))
'(("/foo/bar" . "foo/bar") ("/home/www/bar" . "www/bar") ("/foo/baz" . "foo/baz") ("/home/www/baz" . "home/www/baz") ("/opt/foo/www/baz" . "foo/www/baz") ("/var/foo" . "foo")) )))
Expand Down