2018-05-08 19:59:08 +02:00
|
|
|
;;; tools/editorconfig/config.el -*- lexical-binding: t; -*-
|
|
|
|
|
|
2018-06-14 00:11:52 +02:00
|
|
|
;; editorconfig cannot procure the correct settings for extension-less files.
|
|
|
|
|
;; Executable scripts with a shebang line, for example. So why not use Emacs'
|
|
|
|
|
;; major mode to drop editorconfig a hint? This is accomplished by temporarily
|
|
|
|
|
;; appending an extension to `buffer-file-name' when we talk to editorconfig.
|
|
|
|
|
(defvar +editorconfig-mode-alist
|
2018-09-08 18:22:41 -04:00
|
|
|
'((sh-mode . "sh")
|
|
|
|
|
(python-mode . "py")
|
|
|
|
|
(ruby-mode . "rb")
|
|
|
|
|
(enh-ruby-mode . "rb")
|
|
|
|
|
(perl-mode . "pl")
|
|
|
|
|
(php-mode . "php"))
|
2018-06-14 00:11:52 +02:00
|
|
|
"An alist mapping major modes to extensions. Used by
|
:boom: revise advice naming convention (1/2)
This is first of three big naming convention updates that have been a
long time coming. With 2.1 on the horizon, all the breaking updates will
batched together in preparation for the long haul.
In this commit, we do away with the asterix to communicate that a
function is an advice function, and we replace it with the '-a' suffix.
e.g.
doom*shut-up -> doom-shut-up-a
doom*recenter -> doom-recenter-a
+evil*static-reindent -> +evil--static-reindent-a
The rationale behind this change is:
1. Elisp's own formatting/indenting tools would occasionally struggle
with | and * (particularly pp and cl-prettyprint). They have no
problem with / and :, fortunately.
2. External syntax highlighters (like pygmentize, discord markdown or
github markdown) struggle with it, sometimes refusing to highlight
code beyond these symbols.
3. * and | are less expressive than - and -- in communicating the
intended visibility, versatility and stability of a function.
4. It complicated the regexps we must use to search for them.
5. They were arbitrary and over-complicated to begin with, decided
on haphazardly way back when Doom was simply "my private config".
Anyhow, like how predicate functions have the -p suffix, we'll adopt the
-a suffix for advice functions, -h for hook functions and -fn for
variable functions.
Other noteable changes:
- Replaces advice-{add,remove}! macro with new def-advice!
macro. The old pair weren't as useful. The new def-advice! saves on a
lot of space.
- Removed "stage" assertions to make sure you were using the right
macros in the right place. Turned out to not be necessary, we'll
employ better checks later.
2019-07-18 15:42:52 +02:00
|
|
|
`doom--editorconfig-smart-detection-a' to give editorconfig filetype hints.")
|
2018-06-14 00:11:52 +02:00
|
|
|
|
|
|
|
|
|
2018-05-08 19:59:08 +02:00
|
|
|
;; Handles whitespace (tabs/spaces) settings externally. This way projects can
|
|
|
|
|
;; specify their own formatting rules.
|
2019-07-23 12:44:03 +02:00
|
|
|
(use-package! editorconfig
|
2019-03-07 00:26:51 -05:00
|
|
|
:after-call (doom-switch-buffer-hook after-find-file)
|
2018-05-08 19:59:08 +02:00
|
|
|
:config
|
2019-07-23 17:24:56 +02:00
|
|
|
(defadvice! +editorconfig--smart-detection-a (orig-fn)
|
2018-05-08 19:59:08 +02:00
|
|
|
"Retrieve the properties for the current file. If it doesn't have an
|
|
|
|
|
extension, try to guess one."
|
2019-07-22 23:28:12 +02:00
|
|
|
:around #'editorconfig-call-editorconfig-exec
|
2018-05-08 19:59:08 +02:00
|
|
|
(let ((buffer-file-name
|
|
|
|
|
(if (and (not (bound-and-true-p org-src-mode))
|
|
|
|
|
(file-name-extension buffer-file-name))
|
|
|
|
|
buffer-file-name
|
|
|
|
|
(format "%s%s" buffer-file-name
|
2018-06-14 00:11:52 +02:00
|
|
|
(if-let* ((ext (cdr (assq major-mode +editorconfig-mode-alist))))
|
2018-05-08 19:59:08 +02:00
|
|
|
(concat "." ext)
|
|
|
|
|
"")))))
|
2018-09-07 22:08:11 -04:00
|
|
|
(funcall orig-fn)))
|
2018-05-08 19:59:08 +02:00
|
|
|
|
2019-07-22 23:28:12 +02:00
|
|
|
(add-hook 'editorconfig-after-apply-functions
|
|
|
|
|
(defun +editorconfig-disable-ws-butler-maybe-h (props)
|
|
|
|
|
"Disable `ws-butler-mode' if trim_trailing_whitespace is true."
|
|
|
|
|
(when (and (equal (gethash 'trim_trailing_whitespace props) "true")
|
|
|
|
|
(bound-and-true-p ws-butler-mode))
|
|
|
|
|
(ws-butler-mode -1))))
|
2018-08-31 13:56:50 +02:00
|
|
|
|
2019-07-22 23:28:12 +02:00
|
|
|
(add-hook 'editorconfig-after-apply-functions
|
|
|
|
|
(defun +editorconfig-disable-indent-detection-h (props)
|
|
|
|
|
"Inhibit `dtrt-indent' if an explicit indent_style and indent_size is
|
2018-08-31 13:56:50 +02:00
|
|
|
specified by editorconfig."
|
2019-07-22 23:28:12 +02:00
|
|
|
(when (or (gethash 'indent_style props)
|
|
|
|
|
(gethash 'indent_size props))
|
|
|
|
|
(setq doom-inhibit-indent-detection 'editorconfig))))
|
2018-05-18 01:28:40 +02:00
|
|
|
|
2018-05-08 19:59:08 +02:00
|
|
|
;; Editorconfig makes indentation too rigid in Lisp modes, so tell
|
2018-09-27 23:04:16 -04:00
|
|
|
;; editorconfig to ignore indentation there. The dynamic indentation support
|
|
|
|
|
;; built into Emacs is superior.
|
2019-07-12 16:47:49 +02:00
|
|
|
(setq editorconfig-lisp-use-default-indent t)
|
2018-05-08 19:59:08 +02:00
|
|
|
|
2018-05-25 00:46:11 +02:00
|
|
|
;;
|
|
|
|
|
(editorconfig-mode +1))
|