From 883a3fa3e60d4110d7814623abec201643e2111b Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 21 Feb 2023 00:46:07 -0500 Subject: [PATCH] fix(csharp): tree-sitter syntax highlight & indent * modules/tools/tree-sitter/packages.el (tree-sitter-indent): added this package so other modules can opt into using it. Close: #6829 Co-authored-by: dradetsky --- modules/lang/csharp/config.el | 11 ++++++++--- modules/tools/tree-sitter/packages.el | 8 +++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/lang/csharp/config.el b/modules/lang/csharp/config.el index ed9970f7a..e605c6eb5 100644 --- a/modules/lang/csharp/config.el +++ b/modules/lang/csharp/config.el @@ -35,9 +35,6 @@ (when (modulep! +lsp) (add-hook 'csharp-mode-local-vars-hook #'lsp! 'append)) - (when (modulep! +tree-sitter) - (add-hook 'csharp-mode-local-vars-hook #'tree-sitter! 'append)) - (defadvice! +csharp-disable-clear-string-fences-a (fn &rest args) "This turns off `c-clear-string-fences' for `csharp-mode'. When on for `csharp-mode' font lock breaks after an interpolated string @@ -47,6 +44,14 @@ or terminating simple string." (apply fn args)))) +(use-package! csharp-tree-sitter + :when (modulep! +tree-sitter) + :defer t + :init + (add-hook 'csharp-mode-local-vars-hook #'tree-sitter! 'append) + (add-to-list 'auto-mode-alist '("\\.cs\\'" . csharp-tree-sitter-mode))) + + ;; Unity shaders (use-package! shader-mode :when (modulep! +unity) diff --git a/modules/tools/tree-sitter/packages.el b/modules/tools/tree-sitter/packages.el index e3a00b248..6ed00e5c0 100644 --- a/modules/tools/tree-sitter/packages.el +++ b/modules/tools/tree-sitter/packages.el @@ -1,11 +1,9 @@ ;; -*- no-byte-compile: t; -*- ;;; tools/tree-sitter/packages.el -(package! tree-sitter - :pin "c3fe96a103a766256ba62120eb638eef8e9a9802") - -(package! tree-sitter-langs - :pin "deb2d8674be8f777ace50e15c7c041aeddb1d0b2") +(package! tree-sitter :pin "c3fe96a103a766256ba62120eb638eef8e9a9802") +(package! tree-sitter-langs :pin "deb2d8674be8f777ace50e15c7c041aeddb1d0b2") +(package! tree-sitter-indent :pin "4ef246db3e4ff99f672fe5e4b416c890f885c09e") (when (modulep! :editor evil +everywhere) (package! evil-textobj-tree-sitter