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:
@ -10,7 +10,7 @@
|
||||
(after! haskell-mode
|
||||
(setq haskell-process-suggest-remove-import-lines t ; warnings for redundant imports etc
|
||||
haskell-process-auto-import-loaded-modules t
|
||||
haskell-process-show-overlays (not (featurep! :checkers syntax))) ; redundant with flycheck
|
||||
haskell-process-show-overlays (not (modulep! :checkers syntax))) ; redundant with flycheck
|
||||
|
||||
(set-lookup-handlers! 'haskell-mode
|
||||
:definition #'haskell-mode-jump-to-def-or-tag)
|
||||
@ -32,7 +32,7 @@
|
||||
(map! :map haskell-mode-map
|
||||
:n "o" #'+haskell/evil-open-below
|
||||
:n "O" #'+haskell/evil-open-above
|
||||
(:when (featurep! :tools lookup)
|
||||
(:when (modulep! :tools lookup)
|
||||
[remap haskell-mode-jump-to-def-or-tag] #'+lookup/definition))
|
||||
|
||||
(map! :localleader
|
||||
@ -44,7 +44,7 @@
|
||||
|
||||
|
||||
(use-package! lsp-haskell
|
||||
:when (featurep! +lsp)
|
||||
:when (modulep! +lsp)
|
||||
:after lsp-mode
|
||||
:preface (add-hook 'haskell-mode-local-vars-hook #'lsp! 'append)
|
||||
:config
|
||||
|
@ -1,8 +1,8 @@
|
||||
;; -*- lexical-binding: t; no-byte-compile: t; -*-
|
||||
;;; lang/haskell/doctor.el
|
||||
|
||||
(assert! (or (not (featurep! +lsp))
|
||||
(featurep! :tools lsp))
|
||||
(assert! (or (not (modulep! +lsp))
|
||||
(modulep! :tools lsp))
|
||||
"This module requires (:tools lsp)")
|
||||
|
||||
(unless (executable-find "cabal")
|
||||
@ -11,17 +11,17 @@
|
||||
(unless (executable-find "hoogle")
|
||||
(warn! "Couldn't find hoogle. Documentation searching will not work."))
|
||||
|
||||
(unless (or (featurep! +lsp)
|
||||
(unless (or (modulep! +lsp)
|
||||
(executable-find "hlint"))
|
||||
(warn! "Couldn't find hlint. Flycheck may have issues in haskell-mode.
|
||||
Install it or enable +lsp."))
|
||||
|
||||
(when (and (featurep! :editor format)
|
||||
(not (featurep! +lsp))
|
||||
(when (and (modulep! :editor format)
|
||||
(not (modulep! +lsp))
|
||||
(not (executable-find "brittany")))
|
||||
(warn! "Couldn't find brittany. Code formatting will not work.
|
||||
Install it or enable +lsp."))
|
||||
|
||||
(when (and (featurep! +lsp)
|
||||
(when (and (modulep! +lsp)
|
||||
(not (executable-find "haskell-language-server-wrapper")))
|
||||
(warn! "Couldn't find haskell-language-server."))
|
||||
|
@ -3,6 +3,6 @@
|
||||
|
||||
(package! haskell-mode :pin "cb573c8db5b856eb37473009f2c62e0717a1cd02")
|
||||
|
||||
(when (and (featurep! +lsp)
|
||||
(not (featurep! :tools lsp +eglot)))
|
||||
(when (and (modulep! +lsp)
|
||||
(not (modulep! :tools lsp +eglot)))
|
||||
(package! lsp-haskell :pin "7cf64944ab3a25ea5d6f8d5e0cd33124182df991"))
|
||||
|
Reference in New Issue
Block a user