emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
doomemacs/modules/lang/web/+html.el

142 lines
5.3 KiB
EmacsLisp
Raw Normal View History

Major optimization refactor, across the board + enable lexical-scope everywhere (lexical-binding = t): ~5-10% faster startup; ~5-20% general boost + reduce consing, function calls & garbage collection by preferring cl-loop & dolist over lambda closures (for mapc[ar], add-hook, and various cl-lib filter/map/reduce functions) -- where possible + prefer functions with dedicated opcodes, like assq (see byte-defop's in bytecomp.el for more) + prefer pcase & cond (faster) over cl-case + general refactor for code readability + ensure naming & style conventions are adhered to + appease byte-compiler by marking unused variables with underscore + defer minor mode activation to after-init, emacs-startup or window-setup hooks; a customization opportunity for users + ensures custom functionality won't interfere with startup.
2017-06-08 11:47:56 +02:00
;;; lang/web/+html.el -*- lexical-binding: t; -*-
Update modules/lang/*
2017-02-19 18:57:16 -05:00
Revert macros to ...! name convention (elisp doesn't like @...)
2017-02-23 00:06:12 -05:00
(def-package! web-mode
Major optimization refactor, across the board + enable lexical-scope everywhere (lexical-binding = t): ~5-10% faster startup; ~5-20% general boost + reduce consing, function calls & garbage collection by preferring cl-loop & dolist over lambda closures (for mapc[ar], add-hook, and various cl-lib filter/map/reduce functions) -- where possible + prefer functions with dedicated opcodes, like assq (see byte-defop's in bytecomp.el for more) + prefer pcase & cond (faster) over cl-case + general refactor for code readability + ensure naming & style conventions are adhered to + appease byte-compiler by marking unused variables with underscore + defer minor mode activation to after-init, emacs-startup or window-setup hooks; a customization opportunity for users + ensures custom functionality won't interfere with startup.
2017-06-08 11:47:56 +02:00
:mode "\\.p?html?$"
Refactor :lang auto-mode-alist entries
2018-05-07 18:18:07 +02:00
:mode "\\.\\(?:tpl\\|blade\\)\\(\\.php\\)?$"
Major optimization refactor, across the board + enable lexical-scope everywhere (lexical-binding = t): ~5-10% faster startup; ~5-20% general boost + reduce consing, function calls & garbage collection by preferring cl-loop & dolist over lambda closures (for mapc[ar], add-hook, and various cl-lib filter/map/reduce functions) -- where possible + prefer functions with dedicated opcodes, like assq (see byte-defop's in bytecomp.el for more) + prefer pcase & cond (faster) over cl-case + general refactor for code readability + ensure naming & style conventions are adhered to + appease byte-compiler by marking unused variables with underscore + defer minor mode activation to after-init, emacs-startup or window-setup hooks; a customization opportunity for users + ensures custom functionality won't interfere with startup.
2017-06-08 11:47:56 +02:00
:mode "\\.erb$"
:mode "\\.jsp$"
:mode "\\.as[cp]x$"
support handlebars templates
2018-05-25 18:13:28 +01:00
:mode "\\.hbs$"
Major optimization refactor, across the board + enable lexical-scope everywhere (lexical-binding = t): ~5-10% faster startup; ~5-20% general boost + reduce consing, function calls & garbage collection by preferring cl-loop & dolist over lambda closures (for mapc[ar], add-hook, and various cl-lib filter/map/reduce functions) -- where possible + prefer functions with dedicated opcodes, like assq (see byte-defop's in bytecomp.el for more) + prefer pcase & cond (faster) over cl-case + general refactor for code readability + ensure naming & style conventions are adhered to + appease byte-compiler by marking unused variables with underscore + defer minor mode activation to after-init, emacs-startup or window-setup hooks; a customization opportunity for users + ensures custom functionality won't interfere with startup.
2017-06-08 11:47:56 +02:00
:mode "\\.mustache$"
:mode "\\.tsx$"
Add Vue file to web mode Support `.vue` Vue.js files in web-mode.
2018-01-09 11:27:48 +00:00
:mode "\\.vue$"
Add twig files Twig files already work nice with web-mode. So detecting them here.
2018-03-19 10:47:06 +00:00
:mode "\\.twig$"
lang/web: add *.jinja to web-mode
2018-05-17 12:26:42 +02:00
:mode "\\.jinja$"
Major optimization refactor, across the board + enable lexical-scope everywhere (lexical-binding = t): ~5-10% faster startup; ~5-20% general boost + reduce consing, function calls & garbage collection by preferring cl-loop & dolist over lambda closures (for mapc[ar], add-hook, and various cl-lib filter/map/reduce functions) -- where possible + prefer functions with dedicated opcodes, like assq (see byte-defop's in bytecomp.el for more) + prefer pcase & cond (faster) over cl-case + general refactor for code readability + ensure naming & style conventions are adhered to + appease byte-compiler by marking unused variables with underscore + defer minor mode activation to after-init, emacs-startup or window-setup hooks; a customization opportunity for users + ensures custom functionality won't interfere with startup.
2017-06-08 11:47:56 +02:00
:mode "wp-content/themes/.+/.+\\.php$"
lang/web: open templates/.+\.php$ in web-mode
2018-01-28 20:38:14 -05:00
:mode "templates/.+\\.php$"
Update modules/lang/*
2017-02-19 18:57:16 -05:00
:config
lang/web: update set-docsets! & general refactor
2018-09-08 18:35:45 -04:00
(set-docsets! 'web-mode "HTML" "CSS" "Twig" "WordPress")
feature/lookup: rewrite dash docset integration + Uses alist variable to store config, rather than hooks + Added check for installed docsets in +lookup/documentation + Set docsets for various language modules (c-mode, c++-mode, css-mode, scss-mode, sass-mode, web-mode, go-mode, racket-mode, emacs-lisp-mode, js2-mode, rjsx-mode, typescript-mode, rust-mode, and php-mode) + Made *eww* popups for dash docsets larger + Renamed set-docset! => set-docsets! (set-docset! is aliased to set-docsets!) + New +lookup/install-docset alias
2018-08-31 02:44:49 +02:00
lang/web: more sensible html-tidy formatter config + No longer inserts html/body tags unless they're detected in the buffer + Respect tab-width and indent-tab-mode + Don't auto-remove empty elements
2018-09-03 03:59:24 +02:00
;; tidy is already defined by the format-all package. We redefine it to add
;; more sensible arguments to the tidy command.
(set-formatter! 'html-tidy
'("tidy" "-q" "-indent"
"--tidy-mark" "no"
"--drop-empty-elements" "no"
General refactor of modules General code and comment improvements. Also, removed the :desc's for csv-mode because map! is currently unable to set which-key descriptions mode-locally, and should be avoided for anything but global keybinds. This will be fixed when General is introduced into Doom.
2018-09-07 22:08:11 -04:00
"--show-body-only" "auto" ; don't inject html/body tags
lang/web: more sensible html-tidy formatter config + No longer inserts html/body tags unless they're detected in the buffer + Respect tab-width and indent-tab-mode + Don't auto-remove empty elements
2018-09-03 03:59:24 +02:00
("--indent-spaces" "%d" tab-width)
("--indent-with-tabs" "%s" (if indent-tabs-mode "yes" "no"))
("-xml" (memq major-mode '(nxml-mode xml-mode))))
:ok-statuses '(0 1))
lang/web: web-mode-enable-auto-quoting = nil
2018-04-28 15:54:39 -04:00
(setq web-mode-enable-html-entities-fontification t
Improve smartparens+web-mode compatibility + Enables web-mode's autopairing functionality + Prevents duplicate >'s after web-mode autopairing. + Leave longer-than-3-character pairs to smartparens (there was only <!-- -->) + Remove <?p -> <?php | ?> autopairer. Leave that to snippets (web-mode doesn't support prefixes longer than 3 letters, and <?php ?> is too much of a performance drain to have smartparens support it, so I added a "php" snippet that expands to <?php | ?>). + Tags now auto-close when you finish typing the opening tag. (web-mode-auto-close-style = 2)
2018-06-24 15:09:49 +02:00
web-mode-auto-close-style 2)
(after! smartparens
Improve web-mode + smartparens compatibility This addresses two edge cases: 1. if web-mode-auto-close-style == 3, <'s behavior may insert an extra > 2. Some web-mode engines have pairs that end with smartparens pairs, which will result in web-mode inserting its closing pairs _and_ smartparens inserting its closing pairs; resulting in extra characters. Reported by @ar1a
2018-08-04 13:39:39 +02:00
(defun +web-is-auto-close-style-3 (_id action _context)
(and (eq action 'insert)
(eq web-mode-auto-close-style 3)))
(sp-local-pair 'web-mode "<" nil :unless '(:add +web-is-auto-close-style-3))
Improve smartparens+web-mode compatibility + Enables web-mode's autopairing functionality + Prevents duplicate >'s after web-mode autopairing. + Leave longer-than-3-character pairs to smartparens (there was only <!-- -->) + Remove <?p -> <?php | ?> autopairer. Leave that to snippets (web-mode doesn't support prefixes longer than 3 letters, and <?php ?> is too much of a performance drain to have smartparens support it, so I added a "php" snippet that expands to <?php | ?>). + Tags now auto-close when you finish typing the opening tag. (web-mode-auto-close-style = 2)
2018-06-24 15:09:49 +02:00
;; let smartparens handle these
(setq web-mode-enable-auto-quoting nil
web-mode-enable-auto-pairing t)
Improve web-mode + smartparens compatibility This addresses two edge cases: 1. if web-mode-auto-close-style == 3, <'s behavior may insert an extra > 2. Some web-mode engines have pairs that end with smartparens pairs, which will result in web-mode inserting its closing pairs _and_ smartparens inserting its closing pairs; resulting in extra characters. Reported by @ar1a
2018-08-04 13:39:39 +02:00
;; 1. Remove web-mode auto pairs whose end pair starts with a latter
;; (truncated autopairs like <?p and hp ?>). Smartparens handles these
;; better.
;; 2. Strips out extra closing pairs to prevent redundant characters
;; inserted by smartparens.
Improve smartparens+web-mode compatibility + Enables web-mode's autopairing functionality + Prevents duplicate >'s after web-mode autopairing. + Leave longer-than-3-character pairs to smartparens (there was only <!-- -->) + Remove <?p -> <?php | ?> autopairer. Leave that to snippets (web-mode doesn't support prefixes longer than 3 letters, and <?php ?> is too much of a performance drain to have smartparens support it, so I added a "php" snippet that expands to <?php | ?>). + Tags now auto-close when you finish typing the opening tag. (web-mode-auto-close-style = 2)
2018-06-24 15:09:49 +02:00
(dolist (alist web-mode-engines-auto-pairs)
Improve web-mode + smartparens compatibility This addresses two edge cases: 1. if web-mode-auto-close-style == 3, <'s behavior may insert an extra > 2. Some web-mode engines have pairs that end with smartparens pairs, which will result in web-mode inserting its closing pairs _and_ smartparens inserting its closing pairs; resulting in extra characters. Reported by @ar1a
2018-08-04 13:39:39 +02:00
(setcdr alist
(cl-loop for pair in (cdr alist)
unless (string-match-p "^[a-z-]" (cdr pair))
collect (cons (car pair)
lang/web: fix Emacs<26 incompatibility #806 The regexp argument for string-trim-right was introduced in 26.1.
2018-08-15 19:51:33 +02:00
;; TODO Replace with `string-trim-right' (Emacs 26+)
Fix void-variable string #809
2018-08-16 02:18:44 +02:00
(let ((string (cdr pair)))
(if (string-match "\\(?:>\\|]\\|}\\)+\\'" string)
(replace-match "" t t string)
string))))))
lang/web: fully remove nil autopair group This removes the nil autopair group, rather than just setting it to nil. No functional different, it's [slightly] more performant.
2018-09-26 20:38:47 -04:00
(delq (assq nil web-mode-engines-auto-pairs) web-mode-engines-auto-pairs))
Update modules/lang/*
2017-02-19 18:57:16 -05:00
Revert macros to ...! name convention (elisp doesn't like @...)
2017-02-23 00:06:12 -05:00
(map! :map web-mode-map
lang/web: add local leader bindings for web-mode Web mode has a bunch of helpful commands under `C-c`, this replicates the same bindings, but in leader-key style. E.g.: `C-c C-a k` becomes `SPC m a k`
2018-03-29 04:45:28 -07:00
(:localleader
:desc "Rehighlight buffer" :n "h" #'web-mode-buffer-highlight
:desc "Indent buffer" :n "i" #'web-mode-buffer-indent
map!: remove buffer-local :desc properties which-key labels are registered globally, and will not work for buffer-local keybinds. Until general is brought in, we'll have to suffer label-less localleader keybinds.
2018-10-07 21:32:42 -04:00
(:prefix "a"
:n "b" #'web-mode-attribute-beginning
:n "e" #'web-mode-attribute-end
:n "i" #'web-mode-attribute-insert
:n "n" #'web-mode-attribute-next
:n "s" #'web-mode-attribute-select
:n "k" #'web-mode-attribute-kill
:n "p" #'web-mode-attribute-previous
:n "p" #'web-mode-attribute-transpose)
lang/web: add local leader bindings for web-mode Web mode has a bunch of helpful commands under `C-c`, this replicates the same bindings, but in leader-key style. E.g.: `C-c C-a k` becomes `SPC m a k`
2018-03-29 04:45:28 -07:00
map!: remove buffer-local :desc properties which-key labels are registered globally, and will not work for buffer-local keybinds. Until general is brought in, we'll have to suffer label-less localleader keybinds.
2018-10-07 21:32:42 -04:00
(:prefix "b"
:n "b" #'web-mode-block-beginning
:n "c" #'web-mode-block-close
:n "e" #'web-mode-block-end
:n "k" #'web-mode-block-kill
:n "n" #'web-mode-block-next
:n "p" #'web-mode-block-previous
:n "s" #'web-mode-block-select)
lang/web: add local leader bindings for web-mode Web mode has a bunch of helpful commands under `C-c`, this replicates the same bindings, but in leader-key style. E.g.: `C-c C-a k` becomes `SPC m a k`
2018-03-29 04:45:28 -07:00
map!: remove buffer-local :desc properties which-key labels are registered globally, and will not work for buffer-local keybinds. Until general is brought in, we'll have to suffer label-less localleader keybinds.
2018-10-07 21:32:42 -04:00
(:prefix "d"
:n "a" #'web-mode-dom-apostrophes-replace
:n "d" #'web-mode-dom-errors-show
:n "e" #'web-mode-dom-entities-encode
:n "n" #'web-mode-dom-normalize
:n "q" #'web-mode-dom-quotes-replace
:n "t" #'web-mode-dom-traverse
:n "x" #'web-mode-dom-xpath)
lang/web: add local leader bindings for web-mode Web mode has a bunch of helpful commands under `C-c`, this replicates the same bindings, but in leader-key style. E.g.: `C-c C-a k` becomes `SPC m a k`
2018-03-29 04:45:28 -07:00
map!: remove buffer-local :desc properties which-key labels are registered globally, and will not work for buffer-local keybinds. Until general is brought in, we'll have to suffer label-less localleader keybinds.
2018-10-07 21:32:42 -04:00
(:prefix "e"
:n "/" #'web-mode-element-close
:n "a" #'web-mode-element-content-select
:n "b" #'web-mode-element-beginning
:n "c" #'web-mode-element-clone
:n "d" #'web-mode-element-child
:n "e" #'web-mode-element-end
:n "f" #'web-mode-element-children-fold-or-unfold
:n "i" #'web-mode-element-insert
:n "k" #'web-mode-element-kill
:n "m" #'web-mode-element-mute-blanks
:n "n" #'web-mode-element-next
:n "p" #'web-mode-element-previous
:n "r" #'web-mode-element-rename
:n "s" #'web-mode-element-select
:n "t" #'web-mode-element-transpose
:n "u" #'web-mode-element-parent
:n "v" #'web-mode-element-vanish
:n "w" #'web-mode-element-wrap)
lang/web: add local leader bindings for web-mode Web mode has a bunch of helpful commands under `C-c`, this replicates the same bindings, but in leader-key style. E.g.: `C-c C-a k` becomes `SPC m a k`
2018-03-29 04:45:28 -07:00
map!: remove buffer-local :desc properties which-key labels are registered globally, and will not work for buffer-local keybinds. Until general is brought in, we'll have to suffer label-less localleader keybinds.
2018-10-07 21:32:42 -04:00
(:prefix "t"
:n "a" #'web-mode-tag-attributes-sort
:n "b" #'web-mode-tag-beginning
:n "e" #'web-mode-tag-end
:n "m" #'web-mode-tag-match
:n "n" #'web-mode-tag-next
:n "p" #'web-mode-tag-previous
:n "s" #'web-mode-tag-select))
lang/web: reformat whitespace in keybinds
2018-04-05 02:26:19 -04:00
PRAISE BE TO THE BYTE COMPILER FOR THY SHARP QUOTES
2017-04-17 02:17:10 -04:00
"M-/" #'web-mode-comment-or-uncomment
:i "SPC" #'self-insert-command
:n "za" #'web-mode-fold-or-unfold
:nv "]a" #'web-mode-attribute-next
:nv "[a" #'web-mode-attribute-previous
:nv "]t" #'web-mode-tag-next
:nv "[t" #'web-mode-tag-previous
:nv "]T" #'web-mode-element-child
:nv "[T" #'web-mode-element-parent))
Update modules/lang/*
2017-02-19 18:57:16 -05:00
Reduce def-package magic; explicitly use :when property
2017-03-19 22:47:50 -04:00
Major refactor & optimization of how modules load their packages Now that we are loading package autoloads files (as part of the generated doom-package-autoload-file when running make autoloads), many :commands properties are redundant. In fact, many def-package! blocks are redundant. In some cases, we can do without a config.el file entirely, and can move into the autoloads file or rely entirely on package autoloads. Also, many settings have been moved in their module's autoloads files, which makes them available ASAP; their use no longer depends on module load order. This gained me a modest ~10% boost in startup speed.
2018-05-25 00:46:11 +02:00
;;
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.
2018-06-15 02:58:12 +02:00
(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))
Reference in a new issue Copy permalink