emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tools/editorconfig: conform to name conventions

Browse source 
Renamed doom-editorconfig-mode-alist to +editorconfig-mode-alist
This commit is contained in:
Henrik Lissner 2018-06-14 00:11:52 +02:00
parent 36171f5b33
commit 5b78cf7ed6
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/tools/editorconfig/config.el
View file

@ -1,5 +1,19 @@
;;; tools/editorconfig/config.el -*- lexical-binding: t; -*- ;;; tools/editorconfig/config.el -*- lexical-binding: t; -*-
;; 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
'((sh-mode . "sh")
(python-mode . "py")
(ruby-mode . "rb")
(perl-mode . "pl")
(php-mode . "php"))
"An alist mapping major modes to extensions. Used by
`doom*editorconfig-smart-detection' to give editorconfig filetype hints.")
;; Handles whitespace (tabs/spaces) settings externally. This way projects can ;; Handles whitespace (tabs/spaces) settings externally. This way projects can
;; specify their own formatting rules. ;; specify their own formatting rules.
(def-package! editorconfig (def-package! editorconfig
@ -13,19 +27,6 @@
(nasm-mode nasm-basic-offset)) (nasm-mode nasm-basic-offset))
editorconfig-indentation-alist)) editorconfig-indentation-alist))
;; 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 doom-editorconfig-mode-alist
'((sh-mode . "sh")
(python-mode . "py")
(ruby-mode . "rb")
(perl-mode . "pl")
(php-mode . "php"))
"An alist mapping major modes to extensions. Used by
`doom*editorconfig-smart-detection' to give editorconfig filetype hints.")
(defun doom*editorconfig-smart-detection (orig-fn &rest args) (defun doom*editorconfig-smart-detection (orig-fn &rest args)
"Retrieve the properties for the current file. If it doesn't have an "Retrieve the properties for the current file. If it doesn't have an
extension, try to guess one." extension, try to guess one."
@ -34,7 +35,7 @@ extension, try to guess one."
(file-name-extension buffer-file-name)) (file-name-extension buffer-file-name))
buffer-file-name buffer-file-name
(format "%s%s" buffer-file-name (format "%s%s" buffer-file-name
(if-let* ((ext (cdr (assq major-mode doom-editorconfig-mode-alist)))) (if-let* ((ext (cdr (assq major-mode +editorconfig-mode-alist))))
(concat "." ext) (concat "." ext)
""))))) "")))))
(apply orig-fn args))) (apply orig-fn args)))