me/guix
Archived
1
0
Fork 0
Code Activity

snippets: Fix move.

Browse source 
The current move is never correct.  It flip-flops between car and cadr for
the destination.  Since the position of the destination is not actually a
fixed point in the list of changes, use a more robust method of inferring it.

* etc/snippets/tempel/text-mode (move\ ): Infer source and destination from
washed diffs.  Process new module before destination.
This commit is contained in:
Liliana Marie Prikler 2022-10-06 21:09:43 +02:00
parent da281417cc
commit 5e63e51afe
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
etc/snippets/tempel/text-mode
View file

@ -122,12 +122,34 @@ text-mode :when (and (fboundp 'git-commit-mode) (git-commit-mode))
nil 'noerror)
(match-string-no-properties 1)))
var)
": Move to "
(concat "("
(string-replace "\.scm" ""
(string-replace "/" " "
(car (magit-staged-files))))
").")
": Move to ("
(p (with-temp-buffer
(magit-git-wash #'magit-diff-wash-diffs
"diff" "--staged")
(goto-char (point-min))
(when (and
(re-search-forward "\\+(define-public \\(\\S-+\\)"
nil 'noerror)
(re-search-backward "modified[ ]*\\(\\S-+\\)"
nil 'noerror))
(string-replace
"\.scm" ""
(string-replace "/" " "
(match-string-no-properties 1)))))
new-module)
")." n
n
n "* " (car (magit-staged-files)) " (" (s var) "): Move from here…"
n "* " (cadr (magit-staged-files)) " (" (s var) "): …to here.")
"* " (p (with-temp-buffer
(magit-git-wash #'magit-diff-wash-diffs
"diff" "--staged")
(goto-char (point-min))
(when (and
(re-search-forward "\\-(define-public \\(\\S-+\\)"
nil 'noerror)
(re-search-backward "modified[ ]*\\(\\S-+\\)"
nil 'noerror))
(match-string-no-properties 1)))
source)
" (" (s var) "): Move from here…" n
"* " (concat (string-replace " " "/" new-module) ".scm")
" (" (s var) "): …to here.")