From 871096533fe65512b28ac5a598c5b60bfc9b8306 Mon Sep 17 00:00:00 2001 From: Sam Precious Date: Tue, 8 Dec 2020 19:21:54 +0000 Subject: [PATCH 1/3] Added in Dotnet interface with sharper through module flag --- modules/lang/csharp/README.org | 3 +++ modules/lang/csharp/config.el | 5 +++++ modules/lang/csharp/packages.el | 2 ++ 3 files changed, 10 insertions(+) diff --git a/modules/lang/csharp/README.org b/modules/lang/csharp/README.org index 89667cbb6..10b1c5726 100644 --- a/modules/lang/csharp/README.org +++ b/modules/lang/csharp/README.org @@ -15,12 +15,14 @@ LSP). ** Module Flags + =+lsp= Enables omnisharp through LSP support (requires omnisharp). ++ =+dotnet= Enables Dotnet transient interface with Sharper + =+unity= Enables special support for the [[https://unity.com/][Unity game engine]] (particularly, support for HLSL shaders). ** Plugins + [[https://github.com/josteink/csharp-mode][csharp-mode]] + [[https://github.com/omajid/csproj-mode][csproj-mode]] ++ [[https://github.com/sebasmonia/sharper][sharper]] (=+dotnet=) + [[https://github.com/OmniSharp/omnisharp-emacs][omnisharp]]* (not =+lsp=) + [[https://github.com/midnightSuyama/shader-mode][shader-mode]]* (=+unity=) @@ -31,6 +33,7 @@ This module needs: it, use ~M-x omnisharp-install-server~) + .NET SDKs (on Windows) + Mono (on UNIX platforms) ++ .NET Core 1.X - 3.X or .NET 5 for cross platform ** TODO MacOS ** Arch Linux diff --git a/modules/lang/csharp/config.el b/modules/lang/csharp/config.el index 19345c26c..a622bbe0e 100644 --- a/modules/lang/csharp/config.el +++ b/modules/lang/csharp/config.el @@ -23,6 +23,11 @@ or terminating simple string." (unless (eq major-mode 'csharp-mode) (apply orig-fn args)))) +(use-package! sharper + :when (featurep! +dotnet) + :bind + ("C-c n" . sharper-main-transient)) + (use-package! omnisharp :unless (featurep! +lsp) diff --git a/modules/lang/csharp/packages.el b/modules/lang/csharp/packages.el index 900ab1fda..d0d68994a 100644 --- a/modules/lang/csharp/packages.el +++ b/modules/lang/csharp/packages.el @@ -2,6 +2,8 @@ ;;; lang/csharp/packages.el (package! csharp-mode :pin "49168293a28aaaf84b9655fe1b2abe402c5e2ee1") +(when (featurep! +dotnet) + (package! sharper :pin "d610b839dbb907cc0a49b7edfe7fe39aa3f9dd6d")) (package! csproj-mode :pin "a7f0f4610c976a28c41b9b8299892f88b5d0336c") (unless (featurep! +lsp) (package! omnisharp :pin "e26ff8b8d34a247cd4a93be5d62a5f21859b7b57")) From 41b1a7800ad58d8bf74ac2bb53329303642e4bc2 Mon Sep 17 00:00:00 2001 From: Sam Precious Date: Tue, 8 Dec 2020 19:39:32 +0000 Subject: [PATCH 2/3] Updated ordering --- modules/lang/csharp/README.org | 6 +++--- modules/lang/csharp/config.el | 11 +++++------ modules/lang/csharp/packages.el | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/modules/lang/csharp/README.org b/modules/lang/csharp/README.org index 10b1c5726..d3a0692f0 100644 --- a/modules/lang/csharp/README.org +++ b/modules/lang/csharp/README.org @@ -15,17 +15,17 @@ LSP). ** Module Flags + =+lsp= Enables omnisharp through LSP support (requires omnisharp). -+ =+dotnet= Enables Dotnet transient interface with Sharper + =+unity= Enables special support for the [[https://unity.com/][Unity game engine]] (particularly, support for HLSL shaders). ++ =+dotnet= Enables Dotnet transient interface with Sharper ** Plugins + [[https://github.com/josteink/csharp-mode][csharp-mode]] + [[https://github.com/omajid/csproj-mode][csproj-mode]] -+ [[https://github.com/sebasmonia/sharper][sharper]] (=+dotnet=) + [[https://github.com/OmniSharp/omnisharp-emacs][omnisharp]]* (not =+lsp=) + [[https://github.com/midnightSuyama/shader-mode][shader-mode]]* (=+unity=) - ++ [[https://github.com/sebasmonia/sharper][sharper]] (=+dotnet=) + * Prerequisites This module needs: diff --git a/modules/lang/csharp/config.el b/modules/lang/csharp/config.el index a622bbe0e..5dcbeee1c 100644 --- a/modules/lang/csharp/config.el +++ b/modules/lang/csharp/config.el @@ -23,12 +23,6 @@ or terminating simple string." (unless (eq major-mode 'csharp-mode) (apply orig-fn args)))) -(use-package! sharper - :when (featurep! +dotnet) - :bind - ("C-c n" . sharper-main-transient)) - - (use-package! omnisharp :unless (featurep! +lsp) :commands omnisharp-install-server @@ -79,3 +73,8 @@ or terminating simple string." (def-project-mode! +csharp-unity-mode :modes '(csharp-mode shader-mode) :files (and "Assets" "Library/MonoManager.asset" "Library/ScriptMapper"))) + +(use-package! sharper + :when (featurep! +dotnet) + :bind + ("C-c d" . sharper-main-transient)) diff --git a/modules/lang/csharp/packages.el b/modules/lang/csharp/packages.el index d0d68994a..4e735c9d7 100644 --- a/modules/lang/csharp/packages.el +++ b/modules/lang/csharp/packages.el @@ -2,10 +2,10 @@ ;;; lang/csharp/packages.el (package! csharp-mode :pin "49168293a28aaaf84b9655fe1b2abe402c5e2ee1") -(when (featurep! +dotnet) - (package! sharper :pin "d610b839dbb907cc0a49b7edfe7fe39aa3f9dd6d")) (package! csproj-mode :pin "a7f0f4610c976a28c41b9b8299892f88b5d0336c") (unless (featurep! +lsp) (package! omnisharp :pin "e26ff8b8d34a247cd4a93be5d62a5f21859b7b57")) (when (featurep! +unity) (package! shader-mode :pin "d7dc8d0d6fe8914e8b6d5cf2081ad61e6952359c")) +(when (featurep! +dotnet) + (package! sharper :pin "d610b839dbb907cc0a49b7edfe7fe39aa3f9dd6d")) From 9d12761c393e1694ffbd3999b0817a910e3f1c68 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 25 Feb 2021 12:30:13 -0500 Subject: [PATCH 3/3] Reformat for consistency and s/:bind/:general --- modules/lang/csharp/config.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/lang/csharp/config.el b/modules/lang/csharp/config.el index b8b30e880..e5f009019 100644 --- a/modules/lang/csharp/config.el +++ b/modules/lang/csharp/config.el @@ -94,9 +94,10 @@ or terminating simple string." :modes '(csharp-mode shader-mode) :files (and "Assets" "Library/MonoManager.asset" "Library/ScriptMapper"))) + (use-package! sharper :when (featurep! +dotnet) - :bind - ("C-c d" . sharper-main-transient)) + :general ("C-c d" #'sharper-main-transient)) + (use-package! sln-mode :mode "\\.sln\\'")