mirror of
https://github.com/doomemacs/doomemacs
synced 2025-09-04 15:03:42 -05:00
refactor(:lang): remove fboundp checks for *-ts-modes
The major-mode-remap advice will handle undefined modes, so all these extra checks aren't needed.
This commit is contained in:
@@ -13,7 +13,6 @@
|
|||||||
|
|
||||||
(use-package! erlang-ts
|
(use-package! erlang-ts
|
||||||
:when (modulep! +tree-sitter)
|
:when (modulep! +tree-sitter)
|
||||||
:when (fboundp 'erlang-ts-mode)
|
|
||||||
:defer t
|
:defer t
|
||||||
:init
|
:init
|
||||||
(set-tree-sitter! 'erlang-mode 'erlang-ts-mode
|
(set-tree-sitter! 'erlang-mode 'erlang-ts-mode
|
||||||
|
@@ -33,7 +33,6 @@
|
|||||||
|
|
||||||
(use-package! graphql-ts-mode
|
(use-package! graphql-ts-mode
|
||||||
:when (modulep! +tree-sitter)
|
:when (modulep! +tree-sitter)
|
||||||
:when (fboundp 'treesit-available-p)
|
|
||||||
:defer t
|
:defer t
|
||||||
:init
|
:init
|
||||||
(set-tree-sitter! 'graphql-mode 'graphql-ts-mode
|
(set-tree-sitter! 'graphql-mode 'graphql-ts-mode
|
||||||
|
@@ -46,7 +46,6 @@
|
|||||||
|
|
||||||
(use-package! haskell-ts-mode
|
(use-package! haskell-ts-mode
|
||||||
:when (modulep! +tree-sitter)
|
:when (modulep! +tree-sitter)
|
||||||
:when (fboundp 'haskell-ts-mode)
|
|
||||||
:defer t
|
:defer t
|
||||||
:init
|
:init
|
||||||
(set-tree-sitter! 'haskell-mode 'haskell-ts-mode
|
(set-tree-sitter! 'haskell-mode 'haskell-ts-mode
|
||||||
|
@@ -22,7 +22,6 @@
|
|||||||
|
|
||||||
(use-package! kotlin-ts-mode
|
(use-package! kotlin-ts-mode
|
||||||
:when (modulep! +tree-sitter)
|
:when (modulep! +tree-sitter)
|
||||||
:when (fboundp 'treesit-available-p)
|
|
||||||
:defer t
|
:defer t
|
||||||
:init
|
:init
|
||||||
(set-tree-sitter! 'kotlin-mode 'kotlin-ts-mode
|
(set-tree-sitter! 'kotlin-mode 'kotlin-ts-mode
|
||||||
|
@@ -44,7 +44,6 @@
|
|||||||
|
|
||||||
(use-package! nix-ts-mode
|
(use-package! nix-ts-mode
|
||||||
:when (modulep! +tree-sitter)
|
:when (modulep! +tree-sitter)
|
||||||
:when (fboundp 'treesit-available-p)
|
|
||||||
:defer t
|
:defer t
|
||||||
:init
|
:init
|
||||||
(set-tree-sitter! 'nix-mode 'nix-ts-mode
|
(set-tree-sitter! 'nix-mode 'nix-ts-mode
|
||||||
|
@@ -14,7 +14,6 @@
|
|||||||
|
|
||||||
(use-package! qml-ts-mode
|
(use-package! qml-ts-mode
|
||||||
:when (modulep! +tree-sitter)
|
:when (modulep! +tree-sitter)
|
||||||
:when (fboundp 'treesit-available-p)
|
|
||||||
:defer t
|
:defer t
|
||||||
:init
|
:init
|
||||||
(set-tree-sitter! 'qml-mode 'qml-ts-mode
|
(set-tree-sitter! 'qml-mode 'qml-ts-mode
|
||||||
|
@@ -57,7 +57,6 @@
|
|||||||
|
|
||||||
(use-package! scala-ts-mode
|
(use-package! scala-ts-mode
|
||||||
:when (modulep! +tree-sitter)
|
:when (modulep! +tree-sitter)
|
||||||
:when (fboundp 'treesit-available-p)
|
|
||||||
:defer t
|
:defer t
|
||||||
:init
|
:init
|
||||||
(set-tree-sitter! 'scala-mode 'scala-ts-mode
|
(set-tree-sitter! 'scala-mode 'scala-ts-mode
|
||||||
|
@@ -29,7 +29,6 @@
|
|||||||
;; TODO: Mirror sml-mode keybinds to ts-mode
|
;; TODO: Mirror sml-mode keybinds to ts-mode
|
||||||
(use-package! sml-ts-mode
|
(use-package! sml-ts-mode
|
||||||
:when (modulep! +tree-sitter)
|
:when (modulep! +tree-sitter)
|
||||||
:when (fboundp 'treesit-available-p)
|
|
||||||
:defer t
|
:defer t
|
||||||
:init
|
:init
|
||||||
(set-tree-sitter! 'sml-mode 'sml-ts-mode
|
(set-tree-sitter! 'sml-mode 'sml-ts-mode
|
||||||
|
@@ -40,7 +40,6 @@
|
|||||||
|
|
||||||
(use-package! zig-ts-mode
|
(use-package! zig-ts-mode
|
||||||
:when (modulep! +tree-sitter)
|
:when (modulep! +tree-sitter)
|
||||||
:when (fboundp 'zig-ts-mode)
|
|
||||||
:defer t
|
:defer t
|
||||||
:init
|
:init
|
||||||
;; REVIEW: maxxnino/tree-sitter-zig is unmaintained; waiting for alternatives.
|
;; REVIEW: maxxnino/tree-sitter-zig is unmaintained; waiting for alternatives.
|
||||||
|
@@ -44,7 +44,11 @@
|
|||||||
(let ((mode (funcall fn mode)))
|
(let ((mode (funcall fn mode)))
|
||||||
(if-let* ((ts (get mode '+tree-sitter))
|
(if-let* ((ts (get mode '+tree-sitter))
|
||||||
(fallback-mode (car ts)))
|
(fallback-mode (car ts)))
|
||||||
(cond ((not (fboundp mode))
|
(cond ((or (not (fboundp 'treesit-available-p))
|
||||||
|
(not (treesit-available-p)))
|
||||||
|
(message "Treesit unavailable, falling back to `%S'" fallback-mode)
|
||||||
|
fallback-mode)
|
||||||
|
((not (fboundp mode))
|
||||||
(message "Couldn't find `%S', falling back to `%S'" mode fallback-mode)
|
(message "Couldn't find `%S', falling back to `%S'" mode fallback-mode)
|
||||||
fallback-mode)
|
fallback-mode)
|
||||||
((and (or (eq treesit-enabled-modes t)
|
((and (or (eq treesit-enabled-modes t)
|
||||||
|
Reference in New Issue
Block a user