mirror of
https://github.com/doomemacs/doomemacs
synced 2025-08-01 12:17:25 -05:00
refactor: deprecate featurep! for modulep!
featurep! will be renamed modulep! in the future, so it's been deprecated. They have identical interfaces, and can be replaced without issue. featurep! was never quite the right name for this macro. It implied that it had some connection to featurep, which it doesn't (only that it was similar in purpose; still, Doom modules are not features). To undo such implications and be consistent with its namespace (and since we're heading into a storm of breaking changes with the v3 release anyway), now was the best opportunity to begin the transition.
This commit is contained in:
@ -46,14 +46,14 @@ If set to `nil', disable all the above behaviors.")
|
||||
"rb" #'+css/toggle-inline-or-block)
|
||||
|
||||
(use-package! counsel-css
|
||||
:when (featurep! :completion ivy)
|
||||
:when (modulep! :completion ivy)
|
||||
:hook (css-mode . counsel-css-imenu-setup)
|
||||
:init
|
||||
(map! :map (css-mode-map scss-mode-map less-css-mode-map)
|
||||
:localleader ";" #'counsel-css))
|
||||
|
||||
(use-package! helm-css-scss
|
||||
:when (featurep! :completion helm)
|
||||
:when (modulep! :completion helm)
|
||||
:defer t
|
||||
:init
|
||||
(map! :map (css-mode-map scss-mode-map less-css-mode-map)
|
||||
@ -71,12 +71,12 @@ If set to `nil', disable all the above behaviors.")
|
||||
;;
|
||||
;;; Tools
|
||||
|
||||
(when (featurep! +lsp)
|
||||
(when (modulep! +lsp)
|
||||
(add-hook! '(css-mode-local-vars-hook
|
||||
scss-mode-local-vars-hook
|
||||
sass-mode-local-vars-hook
|
||||
less-css-mode-local-vars-hook)
|
||||
:append #'lsp!))
|
||||
|
||||
(when (featurep! +tree-sitter)
|
||||
(when (modulep! +tree-sitter)
|
||||
(add-hook 'css-mode-local-vars-hook #'tree-sitter! 'append))
|
||||
|
@ -163,13 +163,13 @@
|
||||
(set-company-backend! 'slim-mode 'company-web-slim))
|
||||
|
||||
|
||||
(when (featurep! +lsp)
|
||||
(when (modulep! +lsp)
|
||||
(add-hook! '(html-mode-local-vars-hook
|
||||
web-mode-local-vars-hook
|
||||
nxml-mode-local-vars-hook)
|
||||
:append #'lsp!))
|
||||
|
||||
(when (featurep! +tree-sitter)
|
||||
(when (modulep! +tree-sitter)
|
||||
(add-hook! '(html-mode-local-vars-hook
|
||||
mhtml-mode-local-vars-hook)
|
||||
:append #'tree-sitter!))
|
||||
|
@ -1,5 +1,5 @@
|
||||
;;; lang/html/autoload/evil.el -*- lexical-binding: t; -*-
|
||||
;;;###if (featurep! :editor evil)
|
||||
;;;###if (modulep! :editor evil)
|
||||
|
||||
;;;###autoload (autoload '+web:encode-html-entities "lang/web/autoload/evil" nil t)
|
||||
(evil-define-operator +web:encode-html-entities (beg end &optional bang input)
|
||||
|
@ -127,7 +127,7 @@ snippet, or `emmet-expand-yas'/`emmet-expand-line', depending on whether
|
||||
(not (or (memq (char-after) (list ?\n ?\s ?\t))
|
||||
(eobp))))
|
||||
#'indent-for-tab-command)
|
||||
((featurep! :editor snippets)
|
||||
((modulep! :editor snippets)
|
||||
(require 'yasnippet)
|
||||
(if (yas--templates-for-key-at-point)
|
||||
#'yas-expand
|
||||
|
@ -40,7 +40,7 @@
|
||||
:modes '(php-mode web-mode css-mode haml-mode pug-mode)
|
||||
:files (or "wp-config.php" "wp-config-sample.php"))
|
||||
|
||||
(when (featurep! :lang javascript)
|
||||
(when (modulep! :lang javascript)
|
||||
(def-project-mode! +web-angularjs-mode
|
||||
:modes '(+javascript-npm-mode)
|
||||
:when (+javascript-npm-dep-p '(angular @angular/core))
|
||||
|
@ -1,11 +1,11 @@
|
||||
;;; lang/web/doctor.el -*- lexical-binding: t; -*-
|
||||
|
||||
(assert! (or (not (featurep! +lsp))
|
||||
(featurep! :tools lsp))
|
||||
(assert! (or (not (modulep! +lsp))
|
||||
(modulep! :tools lsp))
|
||||
"This module requires (:tools lsp)")
|
||||
|
||||
(assert! (or (not (featurep! +tree-sitter))
|
||||
(featurep! :tools tree-sitter))
|
||||
(assert! (or (not (modulep! +tree-sitter))
|
||||
(modulep! :tools tree-sitter))
|
||||
"This module requires (:tools tree-sitter)")
|
||||
|
||||
(unless (executable-find "js-beautify")
|
||||
|
@ -7,7 +7,7 @@
|
||||
(package! pug-mode :pin "73f8c2f95eba695f701df20c8436f49abadebdc1")
|
||||
(package! slim-mode :pin "3636d18ab1c8b316eea71c4732eb44743e2ded87")
|
||||
(when (package! web-mode :pin "efa853e5cfff8e0bcacbda9d1c6696b33da91b03")
|
||||
(when (featurep! :completion company)
|
||||
(when (modulep! :completion company)
|
||||
(package! company-web :pin "863fb84b81ed283474e50330cd8d27b1ca0d74f1")))
|
||||
|
||||
;; +css.el
|
||||
@ -18,7 +18,7 @@
|
||||
(package! stylus-mode :pin "1ad7c51f3c6a6ae64550d9510c5e4e8470014375")
|
||||
(package! sws-mode :pin "1ad7c51f3c6a6ae64550d9510c5e4e8470014375")
|
||||
(package! rainbow-mode :pin "949166cc0146bc9fabf74ce70c1c4a097f4cffd4")
|
||||
(when (featurep! :completion ivy)
|
||||
(when (modulep! :completion ivy)
|
||||
(package! counsel-css :pin "8e9c0515fc952452eee786d8ebb43d48ea86c9f8"))
|
||||
(when (featurep! :completion helm)
|
||||
(when (modulep! :completion helm)
|
||||
(package! helm-css-scss :pin "48b996f73af1fef8d6e88a1c545d98f8c50b0cf3"))
|
||||
|
Reference in New Issue
Block a user