From e138cb3a84ac84b2bc95c8a3bdd50af01b26ec78 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 8 Feb 2023 22:15:11 +0000 Subject: [PATCH] fix(language/sh): only activate tree-sitter in sh and bash scripts The tree-sitter grammars don't work properly with zsh scripts for example, so only activate tree-sitter if sh-shell is bash or sh. --- modules/languages/siren-sh.el | 7 +++++-- modules/text-editing/siren-tree-sitter.el | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/languages/siren-sh.el b/modules/languages/siren-sh.el index ca0879f..e44cd44 100644 --- a/modules/languages/siren-sh.el +++ b/modules/languages/siren-sh.el @@ -44,8 +44,11 @@ :preface (defun siren-lsp-bash-mode-setup () - (if (member sh-shell '(bash sh)) - (lsp-deferred))) + (when (member sh-shell '(bash sh)) + (if (fboundp 'lsp-deferred) + (lsp-deferred)) + (if (fboundp 'tree-sitter-mode) + (tree-sitter-mode t)))) :config ;; Create custom lsp-client for shellcheck diagnostics via efm-langserver. diff --git a/modules/text-editing/siren-tree-sitter.el b/modules/text-editing/siren-tree-sitter.el index 8478da1..60734d1 100644 --- a/modules/text-editing/siren-tree-sitter.el +++ b/modules/text-editing/siren-tree-sitter.el @@ -14,7 +14,6 @@ php-mode ruby-mode rust-mode - sh-mode terraform-mode typescript-mode yaml-mode) . siren-tree-sitter-mode-enable)