emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feature/evil: make ex command file modifiers more robust; replace @ with :P

Browse source
This commit is contained in:
Henrik Lissner 2017-04-05 21:46:12 -04:00
parent ce5c7a8f52
commit afad3a924a
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/feature/evil/autoload/evil.el
View file

@ -31,17 +31,17 @@
"Replace special symbols in FILE-NAME. Modified to include other substitution "Replace special symbols in FILE-NAME. Modified to include other substitution
flags." flags."
(let ((regexp (concat "\\(?:^\\|[^\\\\]\\)" (let ((regexp (concat "\\(?:^\\|[^\\\\]\\)"
"\\([#%@]\\)" "\\([#%\\w]\\)"
"\\(\\(?::\\(?:[phtreS~.]\\|g?s[^: $]+\\)\\)*\\)")) "\\(\\(?::\\(?:[PphtreS~.]\\|g?s[^: $]+\\)\\)*\\)"))
case-fold-search) case-fold-search)
;; TODO Remove s.el dependency so I can offer it upstream ;; TODO Remove s.el dependency so I can offer it upstream
(dolist (match (s-match-strings-all regexp file-name)) (dolist (match (s-match-strings-all regexp file-name))
(let ((flags (split-string (cl-caddr match) ":" t)) (let ((flags (split-string (cl-caddr match) ":" t))
(path (file-relative-name (path (file-relative-name
(pcase (cadr match) (pcase (cadr match)
("@" (doom-project-root))
("%" (buffer-file-name)) ("%" (buffer-file-name))
("#" (and (other-buffer) (buffer-file-name (other-buffer))))) ("#" (and (other-buffer) (buffer-file-name (other-buffer))))
(_ file-name))
default-directory)) default-directory))
flag global) flag global)
(when path (when path
@ -54,11 +54,12 @@ flags."
flag (string-remove-prefix "g" flag))) flag (string-remove-prefix "g" flag)))
(setq path (setq path
(or (pcase (substring flag 0 1) (or (pcase (substring flag 0 1)
("P" (doom-project-root))
("p" (expand-file-name path)) ("p" (expand-file-name path))
("~" (file-relative-name path "~")) ("~" (file-relative-name path "~"))
("." (file-relative-name path default-directory)) ("." (file-relative-name path default-directory))
("h" (directory-file-name path)) ("h" (directory-file-name path)) ; FIXME
("t" (file-name-nondirectory (directory-file-name path))) ("t" (file-name-nondirectory (directory-file-name path))) ; FIXME
("r" (file-name-sans-extension path)) ("r" (file-name-sans-extension path))
("e" (file-name-extension path)) ("e" (file-name-extension path))
("s" (let* ((args (evil-delimited-arguments (substring flag 1) 2)) ("s" (let* ((args (evil-delimited-arguments (substring flag 1) 2))
@ -73,7 +74,7 @@ flags."
""))) "")))
(setq file-name (setq file-name
(replace-regexp-in-string (format "\\(?:^\\|[^\\\\]\\)\\(%s\\)" (replace-regexp-in-string (format "\\(?:^\\|[^\\\\]\\)\\(%s\\)"
(string-trim-left (car match))) (regexp-quote (string-trim-left (car match))))
path file-name t t 1))))) path file-name t t 1)))))
(setq file-name (replace-regexp-in-string regexp "\\1" file-name t)))) (setq file-name (replace-regexp-in-string regexp "\\1" file-name t))))