Refactor localleader keybinds #1270

Introduces a select few of the localleader keybind standards proposed in issue #1270, corrects a few typos and introduces more localleader keybinds in general. Co-authored-by: yuhan0 <>
2019-10-04 17:49:28 -04:00 · 2019-10-04 17:49:28 -04:00 · 051bceb0a8
commit 051bceb0a8
parent fac6eabd72
13 changed files with 98 additions and 95 deletions
--- a/modules/lang/clojure/config.el
+++ b/modules/lang/clojure/config.el
@ -65,8 +65,8 @@
            "\"" #'cider-jack-in-cljs
            "c"  #'cider-connect-clj
            "C"  #'cider-connect-cljs
-
            (:prefix ("e" . "eval")
+              "b" #'cider-eval-buffer
              "d" #'cider-eval-defun-at-point
              "D" #'cider-insert-defun-in-repl
              "e" #'cider-eval-last-sexp
@ -74,7 +74,7 @@
              "r" #'cider-eval-region
              "R" #'cider-insert-region-in-repl
              "u" #'cider-undef)
-            (:prefix ("g" . "go/jump")
+            (:prefix ("g" . "goto")
              "b" #'cider-pop-back
              "g" #'cider-find-var
              "n" #'cider-find-ns)
@ -90,10 +90,11 @@
              "r" #'cider-inspect-last-result)
            (:prefix ("m" . "macro")
              "e" #'cider-macroexpand-1
-              "E" #'cider-macroexpand-al)
+              "E" #'cider-macroexpand-all)
            (:prefix ("n" . "namespace")
              "n" #'cider-browse-ns
-              "N" #'cider-browse-ns-all)
+              "N" #'cider-browse-ns-all
+              "r" #'cider-ns-refresh)
            (:prefix ("r" . "repl")
              "n" #'cider-repl-set-ns
              "q" #'cider-quit
--- a/modules/lang/common-lisp/config.el
+++ b/modules/lang/common-lisp/config.el
@ -69,8 +69,23 @@
  (map! :localleader
        :map lisp-mode-map
        :desc "Sly"          "'" #'sly
-        :desc "Sly (ask)" ";" (λ! () (let ((current-prefix-arg '-)) (sly nil nil t)))
-        (:prefix ("g" . "Go")
+        :desc "Sly (ask)"    ";" (λ!! #'sly '-)
+        :desc "Expand macro" "m" #'macrostep-expand
+        (:prefix ("c" . "compile")
+          :desc "Compile file"          "c" #'sly-compile-file
+          :desc "Compile/load file"     "C" #'sly-compile-and-load-file
+          :desc "Compile toplevel form" "f" #'sly-compile-defun
+          :desc "Load file"             "l" #'sly-load-file
+          :desc "Remove notes"          "n" #'sly-remove-notes
+          :desc "Compile region"        "r" #'sly-compile-region)
+        (:prefix ("e" . "evaluate")
+          :desc "Evaulate buffer"     "b" #'sly-eval-buffer
+          :desc "Evaluate last"       "e" #'sly-eval-last-expression
+          :desc "Evaluate/print last" "E" #'sly-eval-print-last-expression
+          :desc "Evaluate defun"      "f" #'sly-eval-defun
+          :desc "Undefine function"   "F" #'sly-undefine-function
+          :desc "Evaluate region"     "r" #'sly-eval-region)
+        (:prefix ("g" . "goto")
          :desc "Go back"              "b" #'sly-pop-find-definition-stack
          :desc "Go to"                "d" #'sly-edit-definition
          :desc "Go to (other window)" "D" #'sly-edit-definition-other-window
@ -78,7 +93,7 @@
          :desc "Previous note"        "N" #'sly-previous-note
          :desc "Next sticker"         "s" #'sly-stickers-next-sticker
          :desc "Previous sticker"     "S" #'sly-stickers-prev-sticker)
-        (:prefix ("h" . "Help")
+        (:prefix ("h" . "help")
          :desc "Who calls"               "<" #'sly-who-calls
          :desc "Calls who"               ">" #'sly-calls-who
          :desc "Lookup format directive" "~" #'hyperspec-lookup-format
@ -93,35 +108,19 @@
          :desc "Who references"          "r" #'sly-who-references
          :desc "Who specializes"         "s" #'sly-who-specializes
          :desc "Who sets"                "S" #'sly-who-sets)
-        (:prefix ("c" . "Compile")
-          :desc "Compile file" "c" #'sly-compile-file
-          :desc "Compile/load file" "C" #'sly-compile-and-load-file
-          :desc "Compile toplevel form" "f" #'sly-compile-defun
-          :desc "Load file" "l" #'sly-load-file
-          :desc "Remove notes" "n" #'sly-remove-notes
-          :desc "Compile region" "r" #'sly-compile-region)
-        (:prefix ("e" . "Evaluate")
-          :desc "Evaulate buffer" "b" #'sly-eval-buffer
-          :desc "Evaluate last" "e" #'sly-eval-last-expression
-          :desc "Evaluate/print last" "E" #'sly-eval-print-last-expression
-          :desc "Evaluate defun" "f" #'sly-eval-defun
-          :desc "Undefine function" "F" #'sly-undefine-function
-          :desc "Evaluate region" "r" #'sly-eval-region)
-        (:prefix ("m" . "Macro")
-          :desc "Macrostep" "e" #'macrostep-expand)
-        (:prefix ("r" . "REPL")
+        (:prefix ("r" . "repl")
          :desc "Clear REPL"         "c" #'sly-mrepl-clear-repl
          :desc "Quit connection"    "q" #'sly-quit-lisp
          :desc "Restart connection" "r" #'sly-restart-inferior-lisp
          :desc "Sync REPL"          "s" #'sly-mrepl-sync)
-        (:prefix ("s" . "Stickers")
+        (:prefix ("s" . "stickers")
          :desc "Toggle breaking stickers" "b" #'sly-stickers-toggle-break-on-stickers
          :desc "Clear defun stickers"     "c" #'sly-stickers-clear-defun-stickers
          :desc "Clear buffer stickers"    "C" #'sly-stickers-clear-buffer-stickers
          :desc "Fetch stickers"           "f" #'sly-stickers-fetch
          :desc "Replay stickers"          "r" #'sly-stickers-replay
          :desc "Add/remove sticker"       "s" #'sly-stickers-dwim)
-        (:prefix ("t" . "Trace")
+        (:prefix ("t" . "trace")
          :desc "Toggle"         "t" #'sly-toggle-trace-fdefinition
          :desc "Toggle (fancy)" "T" #'sly-toggle-fancy-trace
          :desc "Untrace all"    "u" #'sly-untrace-all))
--- a/modules/lang/csharp/config.el
+++ b/modules/lang/csharp/config.el
@ -44,7 +44,7 @@
          "r"  #'omnisharp-rename
          "a"  #'omnisharp-show-last-auto-complete-result
          "o"  #'omnisharp-show-overloads-at-point)
-        (:prefix "f"
+        (:prefix "g"
          "u"  #'omnisharp-find-usages
          "i"  #'omnisharp-find-implementations
          "f"  #'omnisharp-navigate-to-current-file-member
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@ -77,10 +77,18 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.")

  (map! :localleader
        :map emacs-lisp-mode-map
-        "e" #'macrostep-expand
+        :desc "Expand macro" "m" #'macrostep-expand
        (:prefix ("d" . "debug")
-          ("f" #'+emacs-lisp/edebug-instrument-defun-on)
-          ("F" #'+emacs-lisp/edebug-instrument-defun-off))))
+          "f" #'+emacs-lisp/edebug-instrument-defun-on
+          "F" #'+emacs-lisp/edebug-instrument-defun-off)
+        (:prefix ("e" . "eval")
+          "b" #'eval-buffer
+          "d" #'eval-defun
+          "e" #'eval-last-sexp
+          "r" #'eval-region)
+        (:prefix ("g" . "goto")
+          "f" #'find-function
+          "v" #'find-variable)))

 ;;
 ;;; Packages
--- a/modules/lang/java/+eclim.el
+++ b/modules/lang/java/+eclim.el
@ -18,13 +18,13 @@

  (map! :localleader
        :map java-mode-map
-        (:prefix "r"
+        (:prefix ("r" . "refactor")
          "gc" #'eclim-java-constructor
          "gg" #'eclim-java-generate-getter-and-setter
          "oi" #'eclim-java-import-organize
          "f"  #'eclim-java-format
          "r"  #'eclim-java-refactor-rename-symbol-at-point)
-        (:prefix "h"
+        (:prefix ("h" . "help")
          "."  #'eclim-java-show-documentation-for-current-element
          "r"  #'eclim-java-find-references
          "c"  #'eclim-java-call-hierarchy
@ -32,7 +32,7 @@
          "p"  #'eclim-problems
          "r"  #'meghanada-reference
          "t"  #'meghanada-typeinfo)
-        (:prefix "b"
+        (:prefix ("b" . "build")
          "b"  #'eclim-project-build
          "c"  #'eclim-project-create
          "d"  #'eclim-project-delete
--- a/modules/lang/java/+meghanada.el
+++ b/modules/lang/java/+meghanada.el
@ -16,14 +16,14 @@

  (map! :localleader
        :map java-mode-map
-        (:prefix "r"
+        (:prefix ("r" . "refactor")
          "ia" #'meghanada-import-all
          "io" #'meghanada-optimize-import
          "l"  #'meghanada-local-variable
          "f"  #'meghanada-code-beautify)
-        (:prefix "h"
+        (:prefix ("h" . "help")
          "r"  #'meghanada-reference
          "t"  #'meghanada-typeinfo)
-        (:prefix "b"
+        (:prefix ("b" . "build")
          "f"  #'meghanada-compile-file
          "p"  #'meghanada-compile-project)))
--- a/modules/lang/markdown/config.el
+++ b/modules/lang/markdown/config.el
@ -70,8 +70,9 @@ capture, the end position, and the output buffer.")
          :n "M-r" #'browse-url-of-file)
        (:localleader
          "o" #'markdown-open
-          "b" #'markdown-preview
-          (:prefix "i"
+          "p" #'markdown-preview
+          "e" #'markdown-export
+          (:prefix ("i" . "insert")
            "t" #'markdown-toc-generate-toc
            "i" #'markdown-insert-image
            "l" #'markdown-insert-link))))
--- a/modules/lang/php/config.el
+++ b/modules/lang/php/config.el
@ -27,7 +27,7 @@

  (map! :localleader
        :map php-mode-map
-        :prefix "t"
+        :prefix ("t" . "test")
        "r" #'phpunit-current-project
        "a" #'phpunit-current-class
        "s" #'phpunit-current-test))
@ -42,7 +42,7 @@

  (map! :localleader
        :map php-mode-map
-        :prefix "r"
+        :prefix ("r" . "refactor")
        "cc" #'phpactor-copy-class
        "mc" #'phpactor-move-class
        "oi" #'phpactor-offset-info
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@ -116,7 +116,7 @@ called.")
    (add-hook 'anaconda-mode-hook #'evil-normalize-keymaps))
  (map! :localleader
        :map anaconda-mode-map
-        :prefix "f"
+        :prefix "g"
        "d" #'anaconda-mode-find-definitions
        "h" #'anaconda-mode-show-doc
        "a" #'anaconda-mode-find-assignments
@ -133,8 +133,7 @@ called.")
          :desc "Insert missing imports" "i" #'pyimport-insert-missing
          :desc "Remove unused imports"  "r" #'pyimport-remove-unused
          :desc "Sort imports"           "s" #'pyimpsort-buffer
-          :desc "Optimize imports" "o" #'+python/optimize-imports
-          )))
+          :desc "Optimize imports"       "o" #'+python/optimize-imports)))


 (use-package! nose
@ -165,11 +164,11 @@ called.")
  (map! :after python
        :localleader
        :map python-mode-map
-        :prefix "t"
-        "f" #'python-pytest-file
-        "k" #'python-pytest-file-dwim
-        "t" #'python-pytest-function
-        "m" #'python-pytest-function-dwim
+        :prefix ("t" . "test")
+        "f" #'python-pytest-file-dwim
+        "F" #'python-pytest-file
+        "t" #'python-pytest-function-dwim
+        "T" #'python-pytest-function
        "r" #'python-pytest-repeat
        "p" #'python-pytest-popup))

--- a/modules/lang/racket/config.el
+++ b/modules/lang/racket/config.el
@ -39,17 +39,17 @@
        "t" #'racket-test
        "u" #'racket-backward-up-list
        "y" #'racket-insert-lambda
-        (:prefix "e"
+        (:prefix ("m" . "macros")
          "d" #'racket-expand-definition
-          "l" #'racket-expand-last-sexp
+          "e" #'racket-expand-last-sexp
          "r" #'racket-expand-region
          "a" #'racket-expand-again)
-        (:prefix "g"
+        (:prefix ("g" . "goto")
+          "b" #'racket-unvisit
          "d" #'racket-visit-definition
          "m" #'racket-visit-module
-          "r" #'racket-open-require-path
-          "b" #'racket-unvisit)
-        (:prefix "s"
+          "r" #'racket-open-require-path)
+        (:prefix ("s" . "send")
          "d" #'racket-send-definition
-          "l" #'racket-send-last-sexp
+          "e" #'racket-send-last-sexp
          "r" #'racket-send-region)))
--- a/modules/lang/ruby/config.el
+++ b/modules/lang/ruby/config.el
@ -52,8 +52,8 @@
        "rr" #'robe-rails-refresh
        ;; inf-enh-ruby-mode
        :prefix "s"
-        "f"  #'ruby-send-definition
-        "F"  #'ruby-send-definition-and-go
+        "d"  #'ruby-send-definition
+        "D"  #'ruby-send-definition-and-go
        "r"  #'ruby-send-region
        "R"  #'ruby-send-region-and-go
        "i"  #'ruby-switch-to-inf))
--- a/modules/lang/rust/config.el
+++ b/modules/lang/rust/config.el
@ -83,7 +83,7 @@
      rust-mode-map))
  (map! :map +rust-keymap
        :localleader
-        (:prefix "b"
+        (:prefix ("b" . "build")
          :desc "cargo add"    "a" #'cargo-process-add
          :desc "cargo build"  "b" #'cargo-process-build
          :desc "cargo bench"  "B" #'cargo-process-bench
--- a/modules/lang/web/+html.el
+++ b/modules/lang/web/+html.el
@ -64,7 +64,6 @@
        (:localleader
          :desc "Rehighlight buffer" "h" #'web-mode-buffer-highlight
          :desc "Indent buffer"      "i" #'web-mode-buffer-indent
-
          (:prefix ("a" . "attribute")
            "b" #'web-mode-attribute-beginning
            "e" #'web-mode-attribute-end
@ -74,7 +73,6 @@
            "k" #'web-mode-attribute-kill
            "p" #'web-mode-attribute-previous
            "p" #'web-mode-attribute-transpose)
-
          (:prefix ("b" . "block")
            "b" #'web-mode-block-beginning
            "c" #'web-mode-block-close
@ -83,7 +81,6 @@
            "n" #'web-mode-block-next
            "p" #'web-mode-block-previous
            "s" #'web-mode-block-select)
-
          (:prefix ("d" . "dom")
            "a" #'web-mode-dom-apostrophes-replace
            "d" #'web-mode-dom-errors-show
@ -92,7 +89,6 @@
            "q" #'web-mode-dom-quotes-replace
            "t" #'web-mode-dom-traverse
            "x" #'web-mode-dom-xpath)
-
          (:prefix ("e" . "element")
            "/" #'web-mode-element-close
            "a" #'web-mode-element-content-select
@ -112,7 +108,6 @@
            "u" #'web-mode-element-parent
            "v" #'web-mode-element-vanish
            "w" #'web-mode-element-wrap)
-
          (:prefix ("t" . "tag")
            "a" #'web-mode-tag-attributes-sort
            "b" #'web-mode-tag-beginning