diff options
| author |  Tom Willemse | 2020-07-14 09:59:37 -0700 |
|---|---|---|
| committer | Tom Willemse | 2020-07-14 09:59:37 -0700 |
| commit | cf27d78d15dfad07335c84d27a66c97ea32e951f (patch) | |
| tree | f7534c44c0c50181b7f427bef220bde0bf5992bf /oni-csharp | |
| parent | dc25705048fec827f32525059d4f3b4358273caf (diff) | |
| download | emacs-config-cf27d78d15dfad07335c84d27a66c97ea32e951f.tar.gz emacs-config-cf27d78d15dfad07335c84d27a66c97ea32e951f.zip | |
Replace ‘omnisharp’ with ‘lsp’ for C# development
Diffstat (limited to 'oni-csharp')
| -rw-r--r-- | oni-csharp/oni-csharp.el | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/oni-csharp/oni-csharp.el b/oni-csharp/oni-csharp.el index 64124af..44884ff 100644 --- a/oni-csharp/oni-csharp.el +++ b/oni-csharp/oni-csharp.el @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2020.0407.114436 -;; Package-Requires: (csharp-mode omnisharp oni-company oni-flycheck oni-yasnippet oni-hydra oni-fci smartparens) +;; Version: 2020.0714.095918 +;; Package-Requires: (csharp-mode oni-company oni-flycheck oni-yasnippet oni-hydra oni-fci oni-lsp smartparens) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -50,18 +50,14 @@ (defhydra oni-csharp-hydra (:color teal :hint nil) " -^Compile^ ^Refactor^ ^Maintenance^ -^^^^^^------------------------------------ -_cp_: Project _rr_: Rename _ms_: Start Omnisharp -_cs_: Solution ^^ _mr_: Reload Solution -^^ ^^ _mS_: Stop Omnisharp +^Compile^ +^^------------ +_cp_: Project +_cs_: Solution +^^ " ("cp" oni-csharp-compile-project) - ("cs" oni-csharp-compile-solution) - ("rr" omnisharp-rename) - ("ms" omnisharp-start-omnisharp-server) - ("mr" omnisharp-reload-solution) - ("mS" omnisharp-stop-server)) + ("cs" oni-csharp-compile-solution)) (defun oni-csharp-compile-solution () (interactive) @@ -146,22 +142,16 @@ _cs_: Solution ^^ _mr_: Reload Solution "Set style rules according to personal (or recommended) preference." (setf (alist-get 'arglist-intro c-offsets-alist) '+)) -(with-eval-after-load 'company - (add-to-list 'company-backends - '(company-omnisharp :with company-yasnippet))) - (add-hook 'csharp-mode-hook 'company-mode) (add-hook 'csharp-mode-hook 'electric-indent-local-mode) (add-hook 'csharp-mode-hook 'fci-mode) (add-hook 'csharp-mode-hook 'flycheck-mode) -(add-hook 'csharp-mode-hook 'omnisharp-mode) +(add-hook 'csharp-mode-hook 'lsp) (add-hook 'csharp-mode-hook 'oni-csharp--auto-fill-mode) (add-hook 'csharp-mode-hook 'oni-csharp--update-style) (add-hook 'csharp-mode-hook 'rainbow-delimiters-mode) (add-hook 'csharp-mode-hook 'smartparens-mode) -(define-key csharp-mode-map (kbd "M-.") 'omnisharp-go-to-definition) -(define-key csharp-mode-map (kbd "M-?") 'omnisharp-find-usages) (define-key csharp-mode-map (kbd "C-c SPC") 'oni-csharp-hydra/body) ;;;###autoload |