fix(factor): package association for lookup handlers & keybinds

This ensures all these fuel keybinds on factor-mode-map (and the
fuel-based lookup handlers) are associated with the fuel-mode
package (in case the user disables the fuel package).

Fix: #7788
Co-authored-by: steve-ayerhart <steve-ayerhart@users.noreply.github.com>
This commit is contained in:
Henrik Lissner 2024-04-05 19:03:18 -04:00 committed by Yann Esposito (Yogsototh)
parent f4ebe1a4c4
commit 6de4e99d41
Signed by untrusted user who does not match committer: yogsototh
GPG key ID: 7B19A4C650D59646

View file

@ -8,73 +8,72 @@
(set-repl-handler! 'factor-mode #'+factor/open-repl (set-repl-handler! 'factor-mode #'+factor/open-repl
:persist t :persist t
:send-region #'fuel-eval-region :send-region #'fuel-eval-region
:send-buffer #'fuel-run-file)) :send-buffer #'fuel-run-file)
(set-lookup-handlers! 'factor-mode
:definition #'fuel-edit-word-at-point
:references #'fuel-show-callers
:documentation #'fuel-help)
(map! :map factor-mode-map
:localleader
"t" #'fuel-test-vocab
"F" #'fuel-run-file
"f" #'run-factor
"a" #'fuel-refresh-all
"L" #'fuel-load-usings
"u" #'fuel-vocab-usage
"U" #'fuel-vocab-uses
(:prefix ("c" . "change")
"w" #'fuel-edit-word-at-point
"d" #'fuel-edit-word-doc-at-point
"v" #'fuel-edit-vocabulary)
(:prefix ("e" . "eval")
"d" #'fuel-eval-definition
"R" #'fuel-eval-extended-region
"r" #'fuel-eval-region)
(:prefix ("h" . "help")
"p" #'fuel-apropos
"h" #'fuel-help
"b" #'fuel-help-display-bookmarks
"v" #'fuel-help-vocab
"w" #'fuel-show-file-words
"c" #'fuel-show-callees
"e" #'fuel-stack-effect-region
"s" #'fuel-stack-effect-sexp)
(:prefix ("s" . "scaffold")
"v" #'fuel-scaffold-vocab
"h" #'fuel-scaffold-help
"t" #'fuel-scaffold-tests)
(:prefix ("r" . "refactor")
"s" #'fuel-refactor-extract-sexp
"w" #'fuel-refactor-extract-region
"v" #'fuel-refactor-extract-vocab
"i" #'fuel-refactor-inline-word
"g" #'fuel-refactor-make-generic
"u" #'fuel-update-usings
"r" #'fuel-refactor-rename-word)))
:config :config
(set-lookup-handlers! 'factor-mode
:definition #'fuel-edit-word-at-point
:references #'fuel-show-callers
:documentation #'fuel-help))
(map! :after fuel-help (map! :after fuel-help
:map fuel-help-mode-map :map fuel-help-mode-map
:localleader :localleader
"e" #'fuel-help-edit "e" #'fuel-help-edit
"d" #'fuel-help-delete-bookmark "d" #'fuel-help-delete-bookmark
"B" #'fuel-help-display-bookmarks "B" #'fuel-help-display-bookmarks
"n" #'fuel-help-next "n" #'fuel-help-next
"d" #'fuel-help-kill-page "d" #'fuel-help-kill-page
"p" #'fuel-help-previous "p" #'fuel-help-previous
"b" #'fuel-help-bookmark-page "b" #'fuel-help-bookmark-page
"e" #'fuel-help-edit) "e" #'fuel-help-edit)
(map! :after factor-mode (map! :after fuel-listener
:map factor-mode-map :map fuel-listener-mode-map
:localleader :localleader
"t" #'fuel-test-vocab "b" #'fuel-switch-to-buffer
"F" #'fuel-run-file "w" #'fuel-switch-to-buffer-other-window
"f" #'run-factor "f" #'fuel-switch-to-buffer-other-frame
"a" #'fuel-refresh-all "e" #'fuel-edit-vocabulary
"L" #'fuel-load-usings "r" #'fuel-refresh-all
"u" #'fuel-vocab-usage "i" #'fuel-stack-mode
"U" #'fuel-vocab-uses "h" #'fuel-help
(:prefix ("c" . "change") "s" #'fuel-scaffold-vocab))
"w" #'fuel-edit-word-at-point
"d" #'fuel-edit-word-doc-at-point
"v" #'fuel-edit-vocabulary)
(:prefix ("e" . "eval")
"d" #'fuel-eval-definition
"R" #'fuel-eval-extended-region
"r" #'fuel-eval-region)
(:prefix ("h" . "help")
"p" #'fuel-apropos
"h" #'fuel-help
"b" #'fuel-help-display-bookmarks
"v" #'fuel-help-vocab
"w" #'fuel-show-file-words
"c" #'fuel-show-callees
"e" #'fuel-stack-effect-region
"s" #'fuel-stack-effect-sexp)
(:prefix ("s" . "scaffold")
"v" #'fuel-scaffold-vocab
"h" #'fuel-scaffold-help
"t" #'fuel-scaffold-tests)
(:prefix ("r" . "refactor")
"s" #'fuel-refactor-extract-sexp
"w" #'fuel-refactor-extract-region
"v" #'fuel-refactor-extract-vocab
"i" #'fuel-refactor-inline-word
"g" #'fuel-refactor-make-generic
"u" #'fuel-update-usings
"r" #'fuel-refactor-rename-word))
(map! :after fuel-listener
:map fuel-listener-mode-map
:localleader
"b" #'fuel-switch-to-buffer
"w" #'fuel-switch-to-buffer-other-window
"f" #'fuel-switch-to-buffer-other-frame
"e" #'fuel-edit-vocabulary
"r" #'fuel-refresh-all
"i" #'fuel-stack-mode
"h" #'fuel-help
"s" #'fuel-scaffold-vocab)