update packages
This commit is contained in:
@@ -16,8 +16,10 @@
|
||||
;; along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
;;; Commentary:
|
||||
;;; Definition for the Helpful Hydras.
|
||||
;;; NOTE: This module is lazy-loaded.
|
||||
|
||||
;; Definition for the Helpful Hydras.
|
||||
|
||||
;; NOTE: This module is lazy-loaded.
|
||||
|
||||
;;; Code:
|
||||
|
||||
@@ -34,10 +36,21 @@
|
||||
treemacs-edit-workspaces
|
||||
treemacs-version)
|
||||
|
||||
(treemacs-import-functions-from "treemacs-file-management"
|
||||
treemacs-rename-file
|
||||
treemacs-create-file
|
||||
treemacs-create-dir
|
||||
treemacs-copy-file
|
||||
treemacs-move-file
|
||||
treemacs-delete-file)
|
||||
|
||||
(treemacs-import-functions-from "treemacs-hydras"
|
||||
treemacs--common-helpful-hydra/body
|
||||
treemacs--advanced-helpful-hydra/body)
|
||||
|
||||
(treemacs-import-functions-from "treemacs-peek-mode"
|
||||
treemacs-peek-mode)
|
||||
|
||||
(cl-defun treemacs--find-keybind (func &optional (pad 8))
|
||||
"Find the keybind for FUNC in treemacs.
|
||||
Return of cons of the key formatted for inclusion in the hydra string, including
|
||||
@@ -108,12 +121,15 @@ find the key a command is bound to it will show a blank instead."
|
||||
(key-open-ace-v (treemacs--find-keybind #'treemacs-visit-node-ace-vertical-split))
|
||||
(key-open-ext (treemacs--find-keybind #'treemacs-visit-node-in-external-application))
|
||||
(key-open-mru (treemacs--find-keybind #'treemacs-visit-node-in-most-recently-used-window))
|
||||
(key-open-close (treemacs--find-keybind #'treemacs-visit-node-close-treemacs))
|
||||
(key-close-above (treemacs--find-keybind #'treemacs-collapse-parent-node))
|
||||
(key-follow-mode (treemacs--find-keybind #'treemacs-follow-mode))
|
||||
(key-fringe-mode (treemacs--find-keybind #'treemacs-fringe-indicator-mode))
|
||||
(key-fwatch-mode (treemacs--find-keybind #'treemacs-filewatch-mode))
|
||||
(key-git-mode (treemacs--find-keybind #'treemacs-git-mode))
|
||||
(key-show-dotfiles (treemacs--find-keybind #'treemacs-toggle-show-dotfiles))
|
||||
(key-indent-guide (treemacs--find-keybind #'treemacs-indent-guide-mode))
|
||||
(key-show-gitignore (treemacs--find-keybind #'treemacs-hide-gitignored-files-mode))
|
||||
(key-toggle-width (treemacs--find-keybind #'treemacs-toggle-fixed-width))
|
||||
(key-add-project (treemacs--find-keybind #'treemacs-add-project-to-workspace 12))
|
||||
(key-remove-project (treemacs--find-keybind #'treemacs-remove-project-from-workspace 12))
|
||||
@@ -124,33 +140,35 @@ find the key a command is bound to it will show a blank instead."
|
||||
%s
|
||||
%s (%s)
|
||||
|
||||
%s ^^^^^^^^│ %s ^^^^^^^^^^^│ %s ^^^^^^│ %s
|
||||
――――――――――――――――――――――――┼――――――――――――――――――――――――――――┼―――――――――――――――――――――――――┼――――――――――――――――――――――――――
|
||||
%s next Line ^^^^│ %s dwim TAB ^^^^│ %s follow mode ^^^^│ %s add project
|
||||
%s prev line ^^^^│ %s dwim RET ^^^^│ %s filewatch mode ^^^^│ %s remove project
|
||||
%s next neighbour ^^^^│ %s open no split ^^^^│ %s git mode ^^^^│ %s rename project
|
||||
%s prev neighbour ^^^^│ %s open horizontal ^^^^│ %s show dotfiles ^^^^│
|
||||
%s goto parent ^^^^│ %s open vertical ^^^^│ %s resizability ^^^^│
|
||||
%s down next window ^^^^│ %s open ace ^^^^│ %s fringe indicator ^^^^│
|
||||
%s up next window ^^^^│ %s open ace horizontal ^^^^│ │
|
||||
%s root up ^^^^│ %s open ace vertical ^^^^│ │
|
||||
%s root down ^^^^│ %s open mru window ^^^^│ │
|
||||
│ %s open externally ^^^^│ │
|
||||
│ %s close parent ^^^^│ │
|
||||
%s ^^^^^^^^│ %s ^^^^^^^^^^^│ %s ^^^^^^│ %s
|
||||
――――――――――――――――――――――――┼――――――――――――――――――――――――――――┼――――――――――――――――――――――――――――――┼――――――――――――――――――――――――――
|
||||
%s next Line ^^^^│ %s dwim TAB ^^^^│ %s follow mode ^^^^│ %s add project
|
||||
%s prev line ^^^^│ %s dwim RET ^^^^│ %s filewatch mode ^^^^│ %s remove project
|
||||
%s next neighbour ^^^^│ %s open no split ^^^^│ %s git mode ^^^^│ %s rename project
|
||||
%s prev neighbour ^^^^│ %s open horizontal ^^^^│ %s show dotfiles ^^^^│
|
||||
%s goto parent ^^^^│ %s open vertical ^^^^│ %s show gitignored files ^^^^│
|
||||
%s down next window ^^^^│ %s open ace ^^^^│ %s resizability ^^^^│
|
||||
%s up next window ^^^^│ %s open ace horizontal ^^^^│ %s fringe indicator ^^^^│
|
||||
%s root up ^^^^│ %s open ace vertical ^^^^│ %s indent guide ^^^^│
|
||||
%s root down ^^^^│ %s open mru window ^^^^│ │
|
||||
│ %s open externally ^^^^│ │
|
||||
│ %s open close treemacs ^^^^│ │
|
||||
│ %s close parent ^^^^│ │
|
||||
"
|
||||
title
|
||||
adv-hint (car (s-split":" (car key-adv-hydra)))
|
||||
column-nav column-nodes column-toggles column-projects
|
||||
(car key-next-line) (car key-tab) (car key-follow-mode) (car key-add-project)
|
||||
(car key-prev-line) (car key-ret) (car key-fwatch-mode) (car key-remove-project)
|
||||
(car key-next-neighbour) (car key-open) (car key-git-mode) (car key-rename-project)
|
||||
column-nav column-nodes column-toggles column-projects
|
||||
(car key-next-line) (car key-tab) (car key-follow-mode) (car key-add-project)
|
||||
(car key-prev-line) (car key-ret) (car key-fwatch-mode) (car key-remove-project)
|
||||
(car key-next-neighbour) (car key-open) (car key-git-mode) (car key-rename-project)
|
||||
(car key-prev-neighbour) (car key-open-horiz) (car key-show-dotfiles)
|
||||
(car key-goto-parent) (car key-open-vert) (car key-toggle-width)
|
||||
(car key-down-next-w) (car key-open-ace) (car key-fringe-mode)
|
||||
(car key-up-next-w) (car key-open-ace-h)
|
||||
(car key-root-up) (car key-open-ace-v)
|
||||
(car key-goto-parent) (car key-open-vert) (car key-show-gitignore)
|
||||
(car key-down-next-w) (car key-open-ace) (car key-toggle-width)
|
||||
(car key-up-next-w) (car key-open-ace-h) (car key-fringe-mode)
|
||||
(car key-root-up) (car key-open-ace-v) (car key-indent-guide)
|
||||
(car key-root-down) (car key-open-mru)
|
||||
(car key-open-ext)
|
||||
(car key-open-close)
|
||||
(car key-close-above))))
|
||||
(eval
|
||||
`(defhydra treemacs--common-helpful-hydra (:exit nil :hint nil :columns 4)
|
||||
@@ -175,17 +193,20 @@ find the key a command is bound to it will show a blank instead."
|
||||
(,(cdr key-open-ace-v) #'treemacs-visit-node-ace-vertical-split)
|
||||
(,(cdr key-open-mru) #'treemacs-visit-node-in-most-recently-used-window)
|
||||
(,(cdr key-open-ext) #'treemacs-visit-node-in-external-application)
|
||||
(,(cdr key-open-close) #'treemacs-visit-node-close-treemacs)
|
||||
(,(cdr key-close-above) #'treemacs-collapse-parent-node)
|
||||
(,(cdr key-follow-mode) #'treemacs-follow-mode)
|
||||
(,(cdr key-show-dotfiles) #'treemacs-toggle-show-dotfiles)
|
||||
(,(cdr key-show-gitignore) #'treemacs-hide-gitignored-files-mode)
|
||||
(,(cdr key-toggle-width) #'treemacs-toggle-fixed-width)
|
||||
(,(cdr key-fringe-mode) #'treemacs-fringe-indicator-mode)
|
||||
(,(cdr key-indent-guide) #'treemacs-indent-guide-mode)
|
||||
(,(cdr key-git-mode) #'treemacs-git-mode)
|
||||
(,(cdr key-fwatch-mode) #'treemacs-filewatch-mode)
|
||||
(,(cdr key-add-project) #'treemacs-add-project-to-workspace)
|
||||
(,(cdr key-remove-project) #'treemacs-remove-project-from-workspace)
|
||||
(,(cdr key-rename-project) #'treemacs-rename-project)
|
||||
("ESC" nil "Exit"))))
|
||||
("<escape>" nil "Exit"))))
|
||||
(treemacs--common-helpful-hydra/body))
|
||||
(treemacs-log-failure "The helpful hydra cannot be summoned without an existing treemacs buffer.")))
|
||||
|
||||
@@ -209,14 +230,15 @@ find the key a command is bound to it will show a blank instead."
|
||||
(column-files (propertize "File Management" 'face 'treemacs-help-column-face))
|
||||
(column-ws (propertize "Workspaces" 'face 'treemacs-help-column-face))
|
||||
(column-misc (propertize "Misc." 'face 'treemacs-help-column-face))
|
||||
(column-window (propertize "Other Window." 'face 'treemacs-help-column-face))
|
||||
(common-hint (format "%s %s"
|
||||
(propertize "For common keybinds see" 'face 'treemacs-help-title-face)
|
||||
(propertize "treemacs-common-helpful-hydra" 'face 'font-lock-function-name-face)))
|
||||
(key-common-hydra (treemacs--find-keybind #'treemacs-common-helpful-hydra))
|
||||
(key-create-file (treemacs--find-keybind #'treemacs-create-file))
|
||||
(key-create-dir (treemacs--find-keybind #'treemacs-create-dir))
|
||||
(key-rename (treemacs--find-keybind #'treemacs-rename))
|
||||
(key-delete (treemacs--find-keybind #'treemacs-delete))
|
||||
(key-rename (treemacs--find-keybind #'treemacs-rename-file))
|
||||
(key-delete (treemacs--find-keybind #'treemacs-delete-file))
|
||||
(key-copy-file (treemacs--find-keybind #'treemacs-copy-file))
|
||||
(key-move-file (treemacs--find-keybind #'treemacs-move-file))
|
||||
(key-refresh (treemacs--find-keybind #'treemacs-refresh))
|
||||
@@ -231,42 +253,48 @@ find the key a command is bound to it will show a blank instead."
|
||||
(key-remove-ws (treemacs--find-keybind #'treemacs-remove-workspace 12))
|
||||
(key-rename-ws (treemacs--find-keybind #'treemacs-rename-workspace 12))
|
||||
(key-switch-ws (treemacs--find-keybind #'treemacs-switch-workspace 12))
|
||||
(key-next-ws (treemacs--find-keybind #'treemacs-next-workspace 12))
|
||||
(key-fallback-ws (treemacs--find-keybind #'treemacs-set-fallback-workspace 12))
|
||||
(key-peek (treemacs--find-keybind #'treemacs-peek-mode 10))
|
||||
(key-line-down (treemacs--find-keybind #'treemacs-next-line-other-window 10))
|
||||
(key-line-up (treemacs--find-keybind #'treemacs-previous-line-other-window 10))
|
||||
(key-page-down (treemacs--find-keybind #'treemacs-next-page-other-window 10))
|
||||
(key-page-up (treemacs--find-keybind #'treemacs-previous-page-other-window 10))
|
||||
(hydra-str
|
||||
(format
|
||||
"
|
||||
%s
|
||||
%s (%s)
|
||||
|
||||
%s ^^^^^^^^^^^^^│ %s ^^^^^^^^│ %s
|
||||
――――――――――――――――――――┼―――――――――――――――――――――――――――――┼―――――――――――――――――――――
|
||||
%s create file ^^^^│ %s Edit Workspaces ^^^^^^^^│ %s refresh
|
||||
%s create dir ^^^^│ %s Create Workspace ^^^^^^^^│ %s (re)set width
|
||||
%s rename ^^^^│ %s Remove Workspace ^^^^^^^^│ %s copy path absolute
|
||||
%s delete ^^^^│ %s Rename Workspace ^^^^^^^^│ %s copy path relative
|
||||
%s copy ^^^^│ %s Switch Workspace ^^^^^^^^│ %s copy root path
|
||||
%s move ^^^^│ %s Set Fallback ^^^^^^^^│ %s re-sort
|
||||
│ │ %s bookmark
|
||||
%s ^^^^^^^^^^^^^│ %s ^^^^^^^^│ %s ^^^^^^^^^^^│ %s
|
||||
――――――――――――――――――――┼―――――――――――――――――――――――――――――┼――――――――――――――――――――┼――――――――――――――――――――――
|
||||
%s create file ^^^^│ %s Edit Workspaces ^^^^^^^^│ %s peek ^^^^^^│ %s refresh
|
||||
%s create dir ^^^^│ %s Create Workspace ^^^^^^^^│ %s line down ^^^^^^│ %s (re)set width
|
||||
%s rename ^^^^│ %s Remove Workspace ^^^^^^^^│ %s line up ^^^^^^│ %s copy path absolute
|
||||
%s delete ^^^^│ %s Rename Workspace ^^^^^^^^│ %s page down ^^^^^^│ %s copy path relative
|
||||
%s copy ^^^^│ %s Switch Workspace ^^^^^^^^│ %s page up ^^^^^^│ %s copy root path
|
||||
%s move ^^^^│ %s Next Workspace ^^^^^^^^│ │ %s re-sort
|
||||
│ %s Set Fallback ^^^^^^^^│ │ %s bookmark
|
||||
|
||||
"
|
||||
title
|
||||
common-hint (car (s-split":" (car key-common-hydra)))
|
||||
column-files column-ws column-misc
|
||||
(car key-create-file) (car key-edit-ws) (car key-refresh)
|
||||
(car key-create-dir) (car key-create-ws) (car key-set-width)
|
||||
(car key-rename) (car key-remove-ws) (car key-copy-path-abs)
|
||||
(car key-delete) (car key-rename-ws) (car key-copy-path-rel)
|
||||
(car key-copy-file) (car key-switch-ws) (car key-copy-root)
|
||||
(car key-move-file) (car key-fallback-ws) (car key-resort)
|
||||
(car key-bookmark))))
|
||||
column-files column-ws column-window column-misc
|
||||
(car key-create-file) (car key-edit-ws) (car key-peek) (car key-refresh)
|
||||
(car key-create-dir) (car key-create-ws) (car key-line-down) (car key-set-width)
|
||||
(car key-rename) (car key-remove-ws) (car key-line-up) (car key-copy-path-abs)
|
||||
(car key-delete) (car key-rename-ws) (car key-page-down) (car key-copy-path-rel)
|
||||
(car key-copy-file) (car key-switch-ws) (car key-page-up) (car key-copy-root)
|
||||
(car key-move-file) (car key-next-ws) (car key-resort)
|
||||
(car key-fallback-ws) (car key-bookmark))))
|
||||
(eval
|
||||
`(defhydra treemacs--advanced-helpful-hydra (:exit nil :hint nil :columns 3)
|
||||
,hydra-str
|
||||
(,(cdr key-common-hydra) #'treemacs-common-helpful-hydra :exit t)
|
||||
(,(cdr key-create-file) #'treemacs-create-file)
|
||||
(,(cdr key-create-dir) #'treemacs-create-dir)
|
||||
(,(cdr key-rename) #'treemacs-rename)
|
||||
(,(cdr key-delete) #'treemacs-delete)
|
||||
(,(cdr key-rename) #'treemacs-rename-file)
|
||||
(,(cdr key-delete) #'treemacs-delete-file)
|
||||
(,(cdr key-copy-file) #'treemacs-copy-file)
|
||||
(,(cdr key-move-file) #'treemacs-move-file)
|
||||
(,(cdr key-refresh) #'treemacs-refresh)
|
||||
@@ -281,8 +309,14 @@ find the key a command is bound to it will show a blank instead."
|
||||
(,(cdr key-remove-ws) #'treemacs-remove-workspace)
|
||||
(,(cdr key-rename-ws) #'treemacs-rename-workspace)
|
||||
(,(cdr key-switch-ws) #'treemacs-switch-workspace)
|
||||
(,(cdr key-next-ws) #'treemacs-next-workspace)
|
||||
(,(cdr key-fallback-ws) #'treemacs-set-fallback-workspace)
|
||||
("ESC" nil "Exit"))))
|
||||
(,(cdr key-peek) #'treemacs-peek-mode)
|
||||
(,(cdr key-line-down) #'treemacs-next-line-other-window)
|
||||
(,(cdr key-line-up) #'treemacs-previous-line-other-window)
|
||||
(,(cdr key-page-down) #'treemacs-next-page-other-window)
|
||||
(,(cdr key-page-up) #'treemacs-previous-previous-other-window)
|
||||
("<escape>" nil "Exit"))))
|
||||
(treemacs--advanced-helpful-hydra/body))
|
||||
(treemacs-log-failure "The helpful hydra cannot be summoned without an existing treemacs buffer.")))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user