From fb82d4e3286935286b51765c4823f290428f25aa Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Thu, 19 Jan 2023 19:43:19 +0200 Subject: [PATCH] (treesit-simple-indent-presets): Have n-p-gp check for grandparent's presence * lisp/treesit.el (treesit-simple-indent-presets): Have n-p-gp check for grandparent's presence before checking its type. --- lisp/treesit.el | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/treesit.el b/lisp/treesit.el index 34d288226fa..7669ed6d18c 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -1102,10 +1102,12 @@ See `treesit-simple-indent-presets'.") (string-match-p parent-t (treesit-node-type parent))) (or (null grand-parent-t) - (string-match-p - grand-parent-t - (treesit-node-type - (treesit-node-parent parent)))))))) + (and + (treesit-node-parent parent) + (string-match-p + grand-parent-t + (treesit-node-type + (treesit-node-parent parent))))))))) (cons 'no-node (lambda (node &rest _) (null node))) (cons 'parent-is (lambda (type) (lambda (_n parent &rest _) -- 2.39.2