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

171 lines
6.4 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
:boom: Rename def-package! -> use-package! Calling this pivotal macro "def-package!" has frequently been a source of confusion. It is a thin wrapper around use-package, and it should be obvious that it is so. For this reason, and to match the naming convention used with other convenience macros/wrappers, it is now use-package!. Also changes def-package-hook! -> use-package-hook! The old macros are now marked obsolete and will be removed when straight integration is merged.
2019-07-23 12:44:03 +02:00
(use-package! web-mode
Associate xhtml files with web-mode
2020-03-05 13:10:01 +02:00
:mode "\\.[px]?html?\\'"
Fix #2564: associate *.eex with web-mode And expand :mode declarations for readability.
2020-02-19 17:28:13 -05:00
:mode "\\.\\(?:tpl\\|blade\\)\\(?:\\.php\\)?\\'"
:mode "\\.erb\\'"
feat(web): add *.[lh]?eex support
2021-09-15 18:20:03 +05:30
:mode "\\.[lh]?eex\\'"
Syntax highlight .sface files as html [Phoenix.LiveView](https://hexdocs.pm/phoenix_live_view) has a project called [Surface](https://surface-ui.org/) that adds a `.sface` extension to files. These should be syntax highlighted as html. First PR!
2021-04-21 15:53:34 -04:00
:mode "\\.sface\\'"
Fix #2564: associate *.eex with web-mode And expand :mode declarations for readability.
2020-02-19 17:28:13 -05:00
:mode "\\.jsp\\'"
:mode "\\.as[cp]x\\'"
:lang web: Recognize .ejs files as web-mode
2021-06-08 02:59:30 +07:00
:mode "\\.ejs\\'"
Fix #2564: associate *.eex with web-mode And expand :mode declarations for readability.
2020-02-19 17:28:13 -05:00
:mode "\\.hbs\\'"
:mode "\\.mustache\\'"
:mode "\\.svelte\\'"
:mode "\\.twig\\'"
Add .jinja2 file extension to supported web files. (#2977)
2020-04-26 21:51:01 +02:00
:mode "\\.jinja2?\\'"
Associate .eco files with web-mode
2020-10-30 21:24:05 -04:00
:mode "\\.eco\\'"
Fix #2564: associate *.eex with web-mode And expand :mode declarations for readability.
2020-02-19 17:28:13 -05:00
:mode "wp-content/themes/.+/.+\\.php\\'"
:mode "templates/.+\\.php\\'"
Prioritize vue-mode over web-mode for *.vue files
2020-05-18 14:38:02 -04:00
:init
;; If the user has installed `vue-mode' then, by appending this to
;; `auto-mode-alist' rather than prepending it, its autoload will have
;; priority over this one.
(add-to-list 'auto-mode-alist '("\\.vue\\'" . web-mode) 'append)
:mode "\\.vue\\'"
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"
Make html-tidy conditionally set --show-body-only Fixes an issue where tidy was aggressively removing parent tags from non-partial html file.
2020-03-27 14:18:38 -04:00
("--show-body-only" "%s" (if +format-region-p "true" "auto"))
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
lang/web: web-mode-auto-close-style = 1 < could be part of an emmet expression or inline script. Closing tags on </ is less ambiguous.
2019-05-04 18:57:35 -04:00
web-mode-auto-close-style 1)
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
(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)))
lang/web: fix 'pair was never defined' error Caused by recent change upstream, in smartparens
2018-11-12 02:35:53 -05:00
(sp-local-pair 'web-mode "<" ">" :unless '(:add +web-is-auto-close-style-3))
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
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))
lang/web: fix duplicate closing delimiters
2019-11-15 02:14:06 -05:00
collect (cons (car pair)
(string-trim-right (cdr pair)
"\\(?:>\\|]\\|}\\)+\\'")))))
Minor, general refactors Also rename custom lookup handlers for consistency and use the new inline :async property instead.
2019-05-02 17:57:31 -04:00
(delq! nil web-mode-engines-auto-pairs))
Update modules/lang/*
2017-02-19 18:57:16 -05:00
Add *.eex to web-mode-engines-alist #2564
2020-02-19 19:01:38 -05:00
(add-to-list 'web-mode-engines-alist '("elixir" . "\\.eex\\'"))
feat(web): make web-mode recognize *.[lh]eex
2021-09-16 00:29:21 +02:00
(add-to-list 'web-mode-engines-alist '("phoenix" . "\\.[lh]eex\\'"))
Add *.eex to web-mode-engines-alist #2564
2020-02-19 19:01:38 -05:00
Fix #4431: don't use // in [JT]SX markup
2020-12-14 16:50:40 -05:00
;; Use // instead of /* as the default comment delimited in JS
(setf (alist-get "javascript" web-mode-comment-formats nil nil #'equal)
"//")
Fix commenting JS in web-mode
2020-02-19 19:03:46 -05:00
(add-hook! 'web-mode-hook
(defun +web--fix-js-comments-h ()
"Fix comment handling in `web-mode' for JavaScript."
(when (member web-mode-content-type '("javascript" "jsx"))
;; For some reason the default is to insert HTML comments even
;; in JavaScript.
(setq-local comment-start "//")
(setq-local comment-end "")
;; Needed since otherwise the default value generated by
;; `comment-normalize-vars' will key off the syntax and think
;; that a single "/" starts a comment, which completely borks
;; auto-fill.
(setq-local comment-start-skip "// *"))))
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
fix(web): web-mode-buffer-highlight -> web-mode-reload This function was renamed upstream. Ref: fxbois/web-mode@4341d9fa1aab
2022-02-09 15:34:24 +01:00
:desc "Rehighlight buffer" "h" #'web-mode-reload
Normalize :leader/:localleader keybinds Evil states no longer apply to them. Also removes x-alt-keysym.
2018-12-23 23:54:27 -05:00
:desc "Indent buffer" "i" #'web-mode-buffer-indent
[ADD] description for web prefix bindings
2019-07-29 09:21:16 +02:00
(:prefix ("a" . "attribute")
Normalize :leader/:localleader keybinds Evil states no longer apply to them. Also removes x-alt-keysym.
2018-12-23 23:54:27 -05:00
"b" #'web-mode-attribute-beginning
"e" #'web-mode-attribute-end
"i" #'web-mode-attribute-insert
"n" #'web-mode-attribute-next
"s" #'web-mode-attribute-select
"k" #'web-mode-attribute-kill
"p" #'web-mode-attribute-previous
fix(web): web-mode-attribute-transpose on wrong key
2022-03-19 22:39:34 +07:00
"t" #'web-mode-attribute-transpose)
[ADD] description for web prefix bindings
2019-07-29 09:21:16 +02:00
(:prefix ("b" . "block")
Normalize :leader/:localleader keybinds Evil states no longer apply to them. Also removes x-alt-keysym.
2018-12-23 23:54:27 -05:00
"b" #'web-mode-block-beginning
"c" #'web-mode-block-close
"e" #'web-mode-block-end
"k" #'web-mode-block-kill
"n" #'web-mode-block-next
"p" #'web-mode-block-previous
"s" #'web-mode-block-select)
[ADD] description for web prefix bindings
2019-07-29 09:21:16 +02:00
(:prefix ("d" . "dom")
Normalize :leader/:localleader keybinds Evil states no longer apply to them. Also removes x-alt-keysym.
2018-12-23 23:54:27 -05:00
"a" #'web-mode-dom-apostrophes-replace
"d" #'web-mode-dom-errors-show
"e" #'web-mode-dom-entities-encode
"n" #'web-mode-dom-normalize
"q" #'web-mode-dom-quotes-replace
"t" #'web-mode-dom-traverse
"x" #'web-mode-dom-xpath)
[ADD] description for web prefix bindings
2019-07-29 09:21:16 +02:00
(:prefix ("e" . "element")
Normalize :leader/:localleader keybinds Evil states no longer apply to them. Also removes x-alt-keysym.
2018-12-23 23:54:27 -05:00
"/" #'web-mode-element-close
"a" #'web-mode-element-content-select
"b" #'web-mode-element-beginning
"c" #'web-mode-element-clone
"d" #'web-mode-element-child
"e" #'web-mode-element-end
"f" #'web-mode-element-children-fold-or-unfold
"i" #'web-mode-element-insert
"k" #'web-mode-element-kill
"m" #'web-mode-element-mute-blanks
"n" #'web-mode-element-next
"p" #'web-mode-element-previous
"r" #'web-mode-element-rename
"s" #'web-mode-element-select
"t" #'web-mode-element-transpose
"u" #'web-mode-element-parent
"v" #'web-mode-element-vanish
"w" #'web-mode-element-wrap)
[ADD] description for web prefix bindings
2019-07-29 09:21:16 +02:00
(:prefix ("t" . "tag")
Normalize :leader/:localleader keybinds Evil states no longer apply to them. Also removes x-alt-keysym.
2018-12-23 23:54:27 -05:00
"a" #'web-mode-tag-attributes-sort
"b" #'web-mode-tag-beginning
"e" #'web-mode-tag-end
"m" #'web-mode-tag-match
"n" #'web-mode-tag-next
"p" #'web-mode-tag-previous
"s" #'web-mode-tag-select))
lang/web: reformat whitespace in keybinds
2018-04-05 02:26:19 -04:00
Normalize :leader/:localleader keybinds Evil states no longer apply to them. Also removes x-alt-keysym.
2018-12-23 23:54:27 -05:00
:g "M-/" #'web-mode-comment-or-uncomment
PRAISE BE TO THE BYTE COMPILER FOR THY SHARP QUOTES
2017-04-17 02:17:10 -04:00
: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
lang/web: enable company-css in web-mode
2019-10-10 14:30:36 -04:00
(set-company-backend! 'web-mode 'company-css 'company-web-html))
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! slim-mode
(set-company-backend! 'slim-mode 'company-web-slim))
Add basic LSP support Still needs to be documented, but includes support for the following languages: + C/C++/ObjC + Go + Java + Javascript + OCaml + PHP + Python + Ruby + Scala + Swift + HTML/CSS Relevant to #460, #716, #1186
2019-02-21 16:08:27 -05:00
(when (featurep! +lsp)
Enable lsp-mode a little later in {html,web}-mode Gives the user more time to customize the mode before they load, either through {html,web}-mode-hook or file/dir-local variables.
2020-05-01 19:53:19 -04:00
(add-hook! '(html-mode-local-vars-hook
tweak(web): add nxml mode to LSP enabled modes Since lsp-mode supports XML (see https://emacs-lsp.github.io/lsp-mode/page/lsp-xml/), it makes sense to add nxml-mode to the list of automatically enabled lsp mode clients.
2021-09-18 16:28:16 +02:00
web-mode-local-vars-hook
nxml-mode-local-vars-hook)
Enable lsp-mode a little later in {html,web}-mode Gives the user more time to customize the mode before they load, either through {html,web}-mode-hook or file/dir-local variables.
2020-05-01 19:53:19 -04:00
#'lsp!))
Reference in a new issue Copy permalink