From 76431f699ed341ace543e55202a9eb79ec8cfbde Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 18 Jun 2022 14:35:13 +0200 Subject: [PATCH] fix(tree-sitter): ensure load order use-package's :after keyword introduces some load order behavior that complicates the user's ability to target it with either after! or with-eval-after-load. Best to avoid it. Ref: jwiegley/use-package#829 --- modules/tools/tree-sitter/config.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/tools/tree-sitter/config.el b/modules/tools/tree-sitter/config.el index a0ff3a3c0..78103fa5b 100644 --- a/modules/tools/tree-sitter/config.el +++ b/modules/tools/tree-sitter/config.el @@ -9,9 +9,11 @@ ;; and this highlights the entire sub tree in your code tree-sitter-debug-highlight-jump-region t)) + (use-package! evil-textobj-tree-sitter :when (featurep! :editor evil +everywhere) - :after tree-sitter + :defer t + :init (after! tree-sitter (require 'evil-textobj-tree-sitter)) :config (defvar +tree-sitter-inner-text-objects-map (make-sparse-keymap)) (defvar +tree-sitter-outer-text-objects-map (make-sparse-keymap)) @@ -58,7 +60,6 @@ "v" (+tree-sitter-goto-textobj "conditional.outer") "l" (+tree-sitter-goto-textobj "loop.outer"))) - (after! which-key (setq which-key-allow-multiple-replacements t) (pushnew!