From 26c522bf5ce8204ae1d0776fbb4a88a35493d6da Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 20 Jul 2024 10:47:47 -0400 Subject: [PATCH 1/2] feat: support treesit ts mode for csharp --- lsp-bridge.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lsp-bridge.el b/lsp-bridge.el index 62b3dce1f0..dc20089f07 100644 --- a/lsp-bridge.el +++ b/lsp-bridge.el @@ -565,7 +565,7 @@ Possible choices are basedpyright_ruff, pyright_ruff, pyright-background-analysi (ess-r-mode . "rlanguageserver") ((graphql-mode graphql-ts-mode) . "graphql-lsp") (swift-mode . "swift-sourcekit") - (csharp-mode . lsp-bridge-csharp-lsp-server) + ((csharp-mode csharp-ts-mode) . lsp-bridge-csharp-lsp-server) (kotlin-mode . "kotlin-language-server") (verilog-mode . "verible") (vhdl-mode . "vhdl-tool") @@ -658,6 +658,7 @@ Possible choices are basedpyright_ruff, pyright_ruff, pyright-background-analysi verilog-mode-hook swift-mode-hook csharp-mode-hook + csharp-ts-mode-hook telega-chat-mode-hook markdown-mode-hook kotlin-mode-hook @@ -735,6 +736,7 @@ you can customize `lsp-bridge-get-workspace-folder' to return workspace folder p (markdown-mode . c-basic-offset) ; Markdown. (csharp-mode . c-basic-offset) ; C# (csharp-tree-sitter-mode . csharp-tree-sitter-indent-offset) ; C# + (csharp-ts-mode . csharp-ts-mode-indent-offset) ; C# (d-mode . c-basic-offset) ; D (julia-mode . c-basic-offset) ; Julia (java-mode . c-basic-offset) ; Java From 2da9f9dad84576fca608cb090a1fc2be65d15f7a Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 20 Jul 2024 10:47:55 -0400 Subject: [PATCH 2/2] remove: obsolete csharp-tree-sitter-mode This was part of https://github.com/emacs-csharp/csharp-mode, which has been moved into emacs core. It is no longer maintained as a separate repo. --- acm/acm-backend-codeium.el | 1 - lsp-bridge.el | 1 - 2 files changed, 2 deletions(-) diff --git a/acm/acm-backend-codeium.el b/acm/acm-backend-codeium.el index 395008d71d..32a6713273 100644 --- a/acm/acm-backend-codeium.el +++ b/acm/acm-backend-codeium.el @@ -66,7 +66,6 @@ (c++-mode . 4) (c++-ts-mode . 4) (csharp-mode . 5) - (csharp-tree-sitter-mode . 5) (csharp-ts-mode . 5) (css-mode . 6) (css-ts-mode . 6) diff --git a/lsp-bridge.el b/lsp-bridge.el index dc20089f07..5f7ca29cb4 100644 --- a/lsp-bridge.el +++ b/lsp-bridge.el @@ -735,7 +735,6 @@ you can customize `lsp-bridge-get-workspace-folder' to return workspace folder p (c++-mode . c-basic-offset) ; C++ (markdown-mode . c-basic-offset) ; Markdown. (csharp-mode . c-basic-offset) ; C# - (csharp-tree-sitter-mode . csharp-tree-sitter-indent-offset) ; C# (csharp-ts-mode . csharp-ts-mode-indent-offset) ; C# (d-mode . c-basic-offset) ; D (julia-mode . c-basic-offset) ; Julia