From 5eed2e9e61a1d1762327ce73152791ffd9ace039 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 18 Jun 2022 14:34:46 +0200 Subject: [PATCH] fix(javascript): guard evil-textobj-tree-sitter setting For non-evil users. --- modules/lang/javascript/config.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index 64eabf742..bbfa47ef5 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -129,14 +129,14 @@ (after! lsp-mode (add-to-list 'lsp--formatting-indent-alist '(typescript-tsx-mode . typescript-indent-level)))) (when (featurep! +tree-sitter) + (after! evil-textobj-tree-sitter + (pushnew! evil-textobj-tree-sitter-major-mode-language-alist '(typescript-tsx-mode . "tsx"))) (after! tree-sitter - (pushnew! tree-sitter-major-mode-language-alist '(typescript-tsx-mode . tsx)) - (pushnew! evil-textobj-tree-sitter-major-mode-language-alist '(typescript-tsx-mode . "tsx")) - - ;; HACK: the tsx grammer doesn't work with the hightlighting provided by - ;; font-lock-keywords. See emacs-tree-sitter/tree-sitter-langs#23 - (setq-hook! 'typescript-tsx-mode-hook - tree-sitter-hl-use-font-lock-keywords nil)))) + (pushnew! tree-sitter-major-mode-language-alist '(typescript-tsx-mode . tsx))) + ;; HACK: the tsx grammer doesn't work with the hightlighting provided by + ;; font-lock-keywords. See emacs-tree-sitter/tree-sitter-langs#23 + (setq-hook! 'typescript-tsx-mode-hook + tree-sitter-hl-use-font-lock-keywords nil))) (set-docsets! '(typescript-mode typescript-tsx-mode) :add "TypeScript" "AngularTS")