Introduce autodefs to replace some settings
+ :popup -> set-popup-rule! + :popups -> set-popup-rules! + :company-backend -> set-company-backend! + :evil-state -> set-evil-initial-state! I am slowly phasing out the setting system (def-setting! and set!), starting with these. What are autodefs? These are functions that are always defined, whether or not their respective modules are enabled. However, when their modules are disabled, they are replaced with macros that no-op and don't waste time evaluating their arguments. The old set! function will still work, for a while.
This commit is contained in:
parent
6693db48af
commit
d8b1e469bc
54 changed files with 329 additions and 248 deletions
|
@ -156,7 +156,7 @@ compilation database is present in the project.")
|
|||
(def-package! company-irony
|
||||
:when (featurep! :completion company)
|
||||
:init
|
||||
(set! :company-backend
|
||||
(set-company-backend!
|
||||
'(c-mode c++-mode objc-mode)
|
||||
'(:separate company-irony-c-headers company-irony))
|
||||
:config
|
||||
|
@ -168,7 +168,8 @@ compilation database is present in the project.")
|
|||
;;
|
||||
|
||||
;; `cmake-mode'
|
||||
(set! :company-backend 'cmake-mode '(company-cmake company-yasnippet))
|
||||
(after! cmake-mode
|
||||
(set-company-backend! 'cmake-mode '(company-cmake company-yasnippet)))
|
||||
|
||||
(def-package! company-cmake
|
||||
:when (featurep! :completion company)
|
||||
|
@ -183,7 +184,7 @@ compilation database is present in the project.")
|
|||
(def-package! company-glsl
|
||||
:when (featurep! :completion company)
|
||||
:after glsl-mode
|
||||
:config (set! :company-backend 'glsl-mode '(company-glsl)))
|
||||
:config (set-company-backend! 'glsl-mode '(company-glsl)))
|
||||
|
||||
|
||||
;;
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(figwheel-sidecar.repl-api/start-figwheel!)
|
||||
(figwheel-sidecar.repl-api/cljs-repl))")
|
||||
|
||||
(set! :popup "^\\*cider-repl" nil '((quit) (select)))
|
||||
(set-popup-rule! "^\\*cider-repl" nil '((quit) (select)))
|
||||
(set! :repl 'clojure-mode #'+clojure/repl)
|
||||
(set! :eval 'clojure-mode #'cider-eval-region)
|
||||
(set! :lookup 'clojure-mode
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
(omnisharp-stop-server)))
|
||||
(add-hook! csharp-mode (add-hook 'kill-buffer-hook #'omnisharp-stop-server nil t))
|
||||
|
||||
(set! :company-backend 'csharp-mode '(company-omnisharp))
|
||||
(set-company-backend! 'csharp-mode '(company-omnisharp))
|
||||
|
||||
(set! :lookup 'csharp-mode
|
||||
:definition #'omnisharp-go-to-definition
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
("\\.plist\\'" . nxml-mode)))
|
||||
(map-put auto-mode-alist (car spec) (cdr spec)))
|
||||
|
||||
(set! :company-backend 'nxml-mode '(company-nxml company-yasnippet))
|
||||
(after! nxml-mode
|
||||
(set-company-backend! 'nxml-mode '(company-nxml company-yasnippet)))
|
||||
|
||||
|
||||
;;
|
||||
|
|
|
@ -12,7 +12,19 @@
|
|||
:skip-match 'sp-elixir-skip-def-p
|
||||
:post-handlers '("||\n[i]"))
|
||||
(sp-local-pair "do " " end" :unless '(sp-in-comment-p sp-in-string-p))
|
||||
(sp-local-pair "fn " " end" :unless '(sp-in-comment-p sp-in-string-p)))))
|
||||
(sp-local-pair "fn " " end" :unless '(sp-in-comment-p sp-in-string-p))))
|
||||
|
||||
(def-package! alchemist-company
|
||||
:when (featurep! :completion company)
|
||||
:commands alchemist-company
|
||||
:init
|
||||
(set-company-backend! 'elixir-mode '(alchemist-company company-yasnippet))
|
||||
:config
|
||||
;; Alchemist doesn't use hook symbols to add these backends, so we have to use
|
||||
;; the entire closure to get rid of it.
|
||||
(let ((fn (byte-compile (lambda () (add-to-list (make-local-variable 'company-backends) 'alchemist-company)))))
|
||||
(remove-hook 'alchemist-mode-hook fn)
|
||||
(remove-hook 'alchemist-iex-mode-hook fn))))
|
||||
|
||||
|
||||
(def-package! alchemist
|
||||
|
@ -24,16 +36,3 @@
|
|||
(set! :eval 'elixir-mode #'alchemist-eval-region)
|
||||
(set! :repl 'elixir-mode #'alchemist-iex-project-run))
|
||||
|
||||
|
||||
(def-package! alchemist-company
|
||||
:when (featurep! :completion company)
|
||||
:commands alchemist-company
|
||||
:init
|
||||
(set! :company-backend 'elixir-mode '(alchemist-company company-yasnippet))
|
||||
:config
|
||||
;; Alchemist doesn't use hook symbols to add these backends, so we have to use
|
||||
;; the entire closure to get rid of it.
|
||||
(let ((fn (byte-compile (lambda () (add-to-list (make-local-variable 'company-backends) 'alchemist-company)))))
|
||||
(remove-hook 'alchemist-mode-hook fn)
|
||||
(remove-hook 'alchemist-iex-mode-hook fn)))
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
(after! elm-mode
|
||||
(add-hook! 'elm-mode-hook #'(flycheck-mode rainbow-delimiters-mode))
|
||||
(set! :company-backend 'elm-mode 'company-elm)
|
||||
(set-company-backend! 'elm-mode 'company-elm)
|
||||
(set! :repl 'elm-mode #'run-elm-interactive))
|
||||
|
||||
|
||||
|
|
|
@ -78,5 +78,5 @@
|
|||
:when (featurep! :completion company)
|
||||
:after go-mode
|
||||
:config
|
||||
(set! :company-backend 'go-mode 'company-go)
|
||||
(set-company-backend! 'go-mode 'company-go)
|
||||
(setq company-go-show-annotation t))
|
||||
|
|
|
@ -16,4 +16,4 @@
|
|||
(add-hook 'haskell-mode-hook #'ghc-comp-init)
|
||||
:config
|
||||
(setq company-ghc-show-info 'oneline)
|
||||
(set! :company-backend 'haskell-mode #'company-ghc))
|
||||
(set-company-backend! 'haskell-mode #'company-ghc))
|
||||
|
|
|
@ -5,4 +5,4 @@
|
|||
:interpreter "hy"
|
||||
:config
|
||||
(set! :repl 'hy-mode #'hy-shell-start-or-switch-to-shell)
|
||||
(set! :company-backend 'hy-mode 'company-hy))
|
||||
(set-company-backend! 'hy-mode 'company-hy))
|
||||
|
|
|
@ -55,4 +55,4 @@
|
|||
:when (featurep! :completion company)
|
||||
:after java-mode
|
||||
:config
|
||||
(set! :company-backend 'java-mode '(company-emacs-eclim)))
|
||||
(set-company-backend! 'java-mode '(company-emacs-eclim)))
|
||||
|
|
|
@ -94,7 +94,7 @@
|
|||
;; tide affects the global `company-backends', undo this so doom can handle
|
||||
;; it buffer-locally
|
||||
(setq-default company-backends (delq 'company-tide (default-value 'company-backends))))
|
||||
(set! :company-backend 'tide-mode 'company-tide)
|
||||
(set-company-backend! 'tide-mode 'company-tide)
|
||||
|
||||
;; navigation
|
||||
(set! :lookup 'tide-mode
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
font-latex-fontify-sectioning 1.15)
|
||||
(setq-default TeX-master nil)
|
||||
;; Display the output of the latex commands in a popup.
|
||||
(set! :popup " output\\*$" '((size . 15)))
|
||||
(set-popup-rule! " output\\*$" '((size . 15)))
|
||||
|
||||
;; TeX Font Styling
|
||||
;; (def-package! tex-style :defer t)
|
||||
|
@ -200,7 +200,7 @@
|
|||
:when (featurep! :completion company)
|
||||
:commands (company-auctex-init)
|
||||
:init
|
||||
;; We can't use the (set! :company-backend ...) because Auctex reports its
|
||||
;; We can't use the (set-company-backend! ...) because Auctex reports its
|
||||
;; major-mode as `latex-mode', but uses LaTeX-mode-hook for its mode, which is
|
||||
;; not anticipated by :company-backend (and shouldn't have to!)
|
||||
(add-hook! LaTeX-mode
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
(set! :lookup 'lua-mode :documentation 'lua-search-documentation)
|
||||
(set! :electric 'lua-mode :words '("else" "end"))
|
||||
(set! :repl 'lua-mode #'+lua/repl)
|
||||
(set! :company-backend 'lua-mode '(company-lua company-yasnippet))
|
||||
(set-company-backend! 'lua-mode '(company-lua company-yasnippet))
|
||||
|
||||
(def-menu! +lua/build-menu
|
||||
"Build/compilation commands for `lua-mode' buffers."
|
||||
|
|
|
@ -8,6 +8,6 @@
|
|||
:after tuareg
|
||||
:hook (tuareg-mode . merlin-mode)
|
||||
:config
|
||||
(set! :company-backend 'tuareg-mode 'merlin-company-backend)
|
||||
(set-company-backend! 'tuareg-mode 'merlin-company-backend)
|
||||
(after! company
|
||||
(remove-hook 'company-backends 'merlin-company-backend)))
|
||||
|
|
|
@ -71,19 +71,19 @@ string). Stops at the first function to return non-nil.")
|
|||
(require 'ob-ipython nil t)))
|
||||
(add-hook '+org-babel-load-functions #'+org|babel-load-ipython)
|
||||
:config
|
||||
(set! :popups
|
||||
'("^\\*Org Src"
|
||||
((size . 100) (side . right) (slot . -1) (window-height . 0.6))
|
||||
((quit) (select . t) (modeline)))
|
||||
'("^\\*Python"
|
||||
((slot . 0) (side . right) (size . 100))
|
||||
((select) (quit) (transient)))
|
||||
'("\\*ob-ipython.*"
|
||||
((slot . 2) (side . right) (size . 100) (window-height . 0.2))
|
||||
((select) (quit) (transient)))
|
||||
'("\\*Python:.*"
|
||||
((slot . 0) (side . right) (size . 100))
|
||||
((select) (quit) (transient))))
|
||||
(set-popup-rules!
|
||||
'(("^\\*Org Src"
|
||||
((size . 100) (side . right) (slot . -1) (window-height . 0.6))
|
||||
((quit) (select . t) (modeline)))
|
||||
("^\\*Python"
|
||||
((slot . 0) (side . right) (size . 100))
|
||||
((select) (quit) (transient)))
|
||||
("\\*ob-ipython.*"
|
||||
((slot . 2) (side . right) (size . 100) (window-height . 0.2))
|
||||
((select) (quit) (transient)))
|
||||
("\\*Python:.*"
|
||||
((slot . 0) (side . right) (size . 100))
|
||||
((select) (quit) (transient)))))
|
||||
;; TODO Add more popup styles
|
||||
|
||||
;; advices for remote kernel and org-src-edit
|
||||
|
|
|
@ -137,19 +137,19 @@ unfold to point on startup."
|
|||
|
||||
(defun +org|setup-popups-rules ()
|
||||
"Defines popup rules for org-mode (does nothing if :ui popup is disabled)."
|
||||
(set! :popups
|
||||
'("^\\*\\(?:Agenda Com\\|Calendar\\|Org \\(?:Links\\|Export Dispatcher\\|Select\\)\\)"
|
||||
((slot . -1) (vslot . -1) (size . +popup-shrink-to-fit))
|
||||
((transient . 0)))
|
||||
'("^\\*Org Agenda"
|
||||
((size . 0.35))
|
||||
((select . t) (transient)))
|
||||
'("^\\*Org Src"
|
||||
((size . 0.3))
|
||||
((quit) (select . t)))
|
||||
'("^CAPTURE.*\\.org$"
|
||||
((size . 0.2))
|
||||
((quit) (select . t)))))
|
||||
(set-popup-rules!
|
||||
'(("^\\*\\(?:Agenda Com\\|Calendar\\|Org \\(?:Links\\|Export Dispatcher\\|Select\\)\\)"
|
||||
((slot . -1) (vslot . -1) (size . +popup-shrink-to-fit))
|
||||
((transient . 0)))
|
||||
("^\\*Org Agenda"
|
||||
((size . 0.35))
|
||||
((select . t) (transient)))
|
||||
("^\\*Org Src"
|
||||
((size . 0.3))
|
||||
((quit) (select . t)))
|
||||
("^CAPTURE.*\\.org$"
|
||||
((size . 0.2))
|
||||
((quit) (select . t))))))
|
||||
|
||||
(defun +org|setup-ui ()
|
||||
"Configures the UI for `org-mode'."
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;; (def-package! hack-mode
|
||||
;; :mode "\\.hh$"
|
||||
;; :config
|
||||
;; (set! :company-backend 'hack-mode '(company-capf)))
|
||||
;; (set-company-backend! 'hack-mode '(company-capf)))
|
||||
|
||||
|
||||
(def-package! php-mode
|
||||
|
@ -22,7 +22,7 @@
|
|||
|
||||
;; ac-php provides custom autocompletion, php-extras provides autocompletion
|
||||
;; for built-in libraries
|
||||
(set! :company-backend 'php-mode '(company-ac-php-backend php-extras-company))
|
||||
(set-company-backend! 'php-mode '(company-ac-php-backend php-extras-company))
|
||||
|
||||
;; default is 10; this optimizes `smartparens' performance, but limits sp
|
||||
;; pairs to 6 characters.
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
(setq plantuml-jar-path (concat doom-etc-dir "plantuml.jar")
|
||||
org-plantuml-jar-path plantuml-jar-path)
|
||||
:config
|
||||
(set! :popup "^\\*PLANTUML" '((size . 0.4)) '((select) (transient . 0))))
|
||||
(set-popup-rule! "^\\*PLANTUML" '((size . 0.4)) '((select) (transient . 0))))
|
||||
|
||||
|
||||
(def-package! flycheck-plantuml
|
||||
|
|
|
@ -79,8 +79,8 @@ environment variables."
|
|||
:config
|
||||
(add-hook 'python-mode-hook #'anaconda-mode)
|
||||
(add-hook 'anaconda-mode-hook #'anaconda-eldoc-mode)
|
||||
(set! :company-backend 'python-mode '(company-anaconda))
|
||||
(set! :popup "^\\*anaconda-mode" nil '((select)))
|
||||
(set-company-backend! 'python-mode '(company-anaconda))
|
||||
(set-popup-rule! "^\\*anaconda-mode" nil '((select)))
|
||||
(set! :lookup 'python-mode
|
||||
:definition #'anaconda-mode-find-definitions
|
||||
:references #'anaconda-mode-find-references
|
||||
|
@ -112,7 +112,7 @@ environment variables."
|
|||
:init
|
||||
(associate! nose-mode :match "/test_.+\\.py$" :modes (python-mode))
|
||||
:config
|
||||
(set! :popup "^\\*nosetests" '((size . 0.4)) '((select)))
|
||||
(set-popup-rule! "^\\*nosetests" '((size . 0.4)) '((select)))
|
||||
(set! :yas-minor-mode 'nose-mode)
|
||||
(map! :map nose-mode-map
|
||||
:localleader
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
(def-package! restclient
|
||||
:mode ("\\.http\\'" . restclient-mode)
|
||||
:config
|
||||
(set! :popup "^\\*HTTP Response" '((size . 0.4)) '((quit . other)))
|
||||
(set-popup-rule! "^\\*HTTP Response" '((size . 0.4)) '((quit . other)))
|
||||
(map! :mode restclient-mode
|
||||
:n [M-return] 'restclient-http-send-current
|
||||
:localleader
|
||||
|
@ -15,4 +15,4 @@
|
|||
(def-package! company-restclient
|
||||
:when (featurep! :completion company)
|
||||
:after restclient
|
||||
:config (set! :company-backend 'restclient-mode 'company-restclient))
|
||||
:config (set-company-backend! 'restclient-mode 'company-restclient))
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
(def-package! ruby-mode
|
||||
:mode "\\.\\(?:pry\\|irb\\)rc\\'"
|
||||
:config
|
||||
(set! :company-backend 'ruby-mode 'company-dabbrev-code)
|
||||
(set-company-backend! 'ruby-mode 'company-dabbrev-code)
|
||||
(set! :electric 'ruby-mode :words '("else" "end" "elseif"))
|
||||
(set! :env "RBENV_ROOT")
|
||||
(set! :repl 'ruby-mode #'inf-ruby) ; `inf-ruby'
|
||||
|
@ -104,7 +104,7 @@ environment variables."
|
|||
(def-package! company-inf-ruby
|
||||
:when (featurep! :completion company)
|
||||
:after inf-ruby
|
||||
:config (set! :company-backend 'inf-ruby-mode 'company-inf-ruby))
|
||||
:config (set-company-backend! 'inf-ruby-mode 'company-inf-ruby))
|
||||
|
||||
|
||||
;; `rake'
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
(def-package! company-racer
|
||||
:when (featurep! :completion company)
|
||||
:after racer
|
||||
:config (set! :company-backend 'rust-mode '(company-racer)))
|
||||
:config (set-company-backend! 'rust-mode '(company-racer)))
|
||||
|
||||
|
||||
(def-package! flycheck-rust
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
;; let DOOM handle company setup
|
||||
ensime-completion-style nil)
|
||||
|
||||
(set! :company-backend 'scala-mode '(ensime-company company-yasnippet))
|
||||
(set-company-backend! 'scala-mode '(ensime-company company-yasnippet))
|
||||
|
||||
;; Fix void-variable imenu-auto-rescan error caused by `ensime--setup-imenu'
|
||||
;; trying to make imenu variables buffer local before imenu is loaded.
|
||||
|
|
|
@ -59,6 +59,6 @@
|
|||
:when (featurep! :completion company)
|
||||
:after sh-script
|
||||
:config
|
||||
(set! :company-backend 'sh-mode '(company-shell company-files))
|
||||
(set-company-backend! 'sh-mode '(company-shell company-files))
|
||||
(setq company-shell-delete-duplicates t))
|
||||
|
||||
|
|
|
@ -25,4 +25,4 @@
|
|||
:after solidity-mode
|
||||
:config
|
||||
(setq company-backends (delq 'company-solidity company-backends))
|
||||
(set! :company-backends 'solidity-mode 'company-solidity))
|
||||
(set-company-backend! 'solidity-mode 'company-solidity))
|
||||
|
|
|
@ -15,5 +15,5 @@
|
|||
:when (featurep! :completion company)
|
||||
:after swift-mode
|
||||
:config
|
||||
(set! :company-backend 'swift-mode '(company-sourcekit company-yasnippet)))
|
||||
(set-company-backend! 'swift-mode '(company-sourcekit company-yasnippet)))
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
(set! :docset 'scss-mode "Sass")
|
||||
(unless EMACS26+
|
||||
;; css-mode's built in completion is superior
|
||||
(set! :company-backend '(css-mode scss-mode) 'company-css))
|
||||
(set-company-backend! '(css-mode scss-mode) 'company-css))
|
||||
(map! :map scss-mode-map :localleader :n "b" #'+css/scss-build))
|
||||
|
||||
|
||||
|
@ -50,6 +50,6 @@
|
|||
:defer t
|
||||
:config
|
||||
(set! :docset 'sass-mode "Sass")
|
||||
(set! :company-backend 'sass-mode 'company-css)
|
||||
(set-company-backend! 'sass-mode 'company-css)
|
||||
(map! :map scss-mode-map :localleader :n "b" #'+css/sass-build))
|
||||
|
||||
|
|
|
@ -92,6 +92,9 @@
|
|||
|
||||
|
||||
;;
|
||||
(set! :company-backend 'pug-mode 'company-web-jade)
|
||||
(set! :company-backend 'web-mode 'company-web-html)
|
||||
(set! :company-backend 'slim-mode 'company-web-slim)
|
||||
(after! pug-mode
|
||||
(set-company-backend! 'pug-mode 'company-web-jade))
|
||||
(after! web-mode
|
||||
(set-company-backend! 'web-mode 'company-web-html))
|
||||
(after! slim-mode
|
||||
(set-company-backend! 'slim-mode 'company-web-slim))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue