From 32f90568a94e252822a7c1c05f1a0f9a64f03990 Mon Sep 17 00:00:00 2001 From: Andre Schaf Date: Fri, 25 Sep 2026 10:38:03 +0200 Subject: [PATCH] some lsp alternatives? --- init.el | 157 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 139 insertions(+), 18 deletions(-) diff --git a/init.el b/init.el index 2e91715..4b5d00b 100644 --- a/init.el +++ b/init.el @@ -1,15 +1,55 @@ -(setq custom-file "./custom.el") +(setq custom-file "~/.emacs.d/custom.el") + (setq display-line-numbers-type 'relative) (global-display-line-numbers-mode 1) (tool-bar-mode 0) (menu-bar-mode 0) ;; (set-frame-parameter nil 'undecorated t) -; (scroll-bar-mode 0) +;; (scroll-bar-mode 0) (fido-vertical-mode 1) (column-number-mode 1) +(delete-selection-mode 1) +(global-hl-line-mode 1) +(which-key-mode 1) +;; window history C-c / +(winner-mode 1) + +;;(setq completion-styles '(hotfuzz)) +;; (setq completion-styles '(flex)) +;; (setq completion-styles '(orderless)) +;; (setq completion-styles '(substring)) (setq select-enable-clipboard t) + +;; completion: RET accepts (drop Windows-colliding M-RET), C-n/C-p navigate, C-c i triggers +(with-eval-after-load 'minibuffer + (keymap-set completion-in-region-mode-map "M-RET" nil) + (keymap-set completion-in-region-mode-map "RET" #'minibuffer-choose-completion) + (keymap-set completion-in-region-mode-map "C-p" #'minibuffer-previous-completion) + (keymap-set completion-in-region-mode-map "C-n" #'minibuffer-next-completion)) +(global-set-key (kbd "C-c i") #'complete-symbol) +(setq completions-max-height 10) ;; cap *Completions* window at 10 lines + +;; --- indentation: spaces everywhere, default 4, ts/html = 3 --- +;; eglot-format reads tab-width (tabSize) and indent-tabs-mode (insertSpaces) +(setq-default indent-tabs-mode nil + tab-width 4) + +;; per-language autoindent offsets (default 4) +(setq csharp-ts-mode-indent-offset 4 + c-ts-mode-indent-offset 4 + js-indent-level 4 + css-indent-offset 3) + +;; ts + html use 3 spaces (also makes eglot-format emit tabSize 3) +(add-hook 'typescript-ts-mode-hook + (lambda () (setq-local typescript-ts-mode-indent-offset 3 tab-width 3))) +(dolist (h '(mhtml-mode-hook html-mode-hook)) + (add-hook h (lambda () (setq-local sgml-basic-offset 3 tab-width 3)))) + +(add-hook 'before-save-hook 'delete-trailing-whitespace) (setq-default truncate-lines t) + (setq make-backup-files nil auto-save-default nil) @@ -20,6 +60,7 @@ (setq package-archives '(("melpa" . "https://melpa.org/packages/") ("gnu" . "https://elpa.gnu.org/packages/"))) +(setq package-install-upgrade-built-in t) ; allow upgrading built-ins (e.g. flymake for eglot 1.24) (package-initialize) (unless package-archive-contents (package-refresh-contents)) (setq use-package-always-ensure t) @@ -30,30 +71,110 @@ :config (global-undo-tree-mode)) -(use-package markdown-mode) - -(use-package tree-sitter-langs +(use-package diff-hl + :hook (after-init . global-diff-hl-mode) :config - (global-tree-sitter-mode)) + (global-set-key (kbd "C-c g p") 'diff-hl-show-hunk) + (global-set-key (kbd "C-c g u") 'diff-hl-revert-hunk) + (global-set-key (kbd "C-c g j") 'diff-hl-next-hunk) + (global-set-key (kbd "C-c g k") 'diff-hl-previous-hunk)) + +(use-package clipetty + :hook (after-init . global-clipetty-mode)) + +;; (use-package markdown-ts-mode) (use-package jumpc :config (jumpc) - (jumpc-bind-vim-key)) + (global-set-key (kbd "C-c o") 'jumpc-jump-backward) + (global-set-key (kbd "C-c i") 'jumpc-jump-forward)) -;; fix eglot stuff +(use-package magit) +(setq magit-status-show-untracked-files 'all) + +(add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-ts-mode)) +(add-to-list 'auto-mode-alist '("\\.cs\\'" . csharp-ts-mode)) + +(defun my/angular-language-server-command (_interactive project) + "Build an Angular language server command for PROJECT." + (let* ((root (project-root project)) + (project-modules (expand-file-name "node_modules" root)) + (ngserver (file-truename (executable-find "ngserver"))) + (ng-modules (expand-file-name "../node_modules" + (file-name-directory ngserver)))) + (list "ngserver" "--stdio" + "--tsProbeLocations" + (string-join (list project-modules ng-modules) ",") + "--ngProbeLocations" ng-modules))) + +(use-package flymake-eslint + :ensure t + :init + (setq flymake-eslint-executable-name "eslint_d") + (setq flymake-eslint-prefer-json-diagnostics t) + :hook ((typescript-ts-mode . flymake-mode) + (scss-mode . flymake-mode) + ((mhtml-mode html-mode) . flymake-mode) + (scss-mode . flymake-mode))) + ;; (typescript-ts-mode . flymake-eslint-enable))) + + +(use-package lsp-mode + :commands (lsp lsp-deferred) + :hook (;; Automatically trigger LSP for tree-sitter typescript modes + (typescript-ts-mode . lsp-deferred) + (tsx-ts-mode . lsp-deferred) + ;; Trigger LSP for Angular HTML templates + (html-mode . lsp-deferred) + (csharp-ts-mode . lsp-deferred) + (web-mode . lsp-deferred)) + :init + (setq lsp-keymap-prefix "C-c l") ; Set custom prefix for LSP commands + :config + (setq lsp-completion-provider :capf + lsp-idle-delay 0.20 + lsp-headerline-breadcrumb-enable t + lsp-enable-folding t)) + +;; eglot for TypeScript (tsgo), C#, SCSS, HTML/Angular. (with-eval-after-load 'eglot (setq eglot-code-action-indications nil) (setq eglot-connect-timeout nil) - ; (setq-default eglot-workspace-configuration - ; '(:csharp (:roslyn (:diagnostics (:openFilesOnly :json-false - ; :analyzersEnabled t) - ; :compilerDiagnostics "true") - ; :useMetadataUris :json-false))) (add-to-list 'eglot-server-programs - '(csharp-ts-mode . ("roslyn-language-server" "--stdio" "--autoLoadProjects"))) + '(csharp-ts-mode . ("roslyn-language-server" "--stdio"))) (add-to-list 'eglot-server-programs - '(typescript-ts-mode . ("tsgo" "--lsp" "--stdio")))) + '(scss-mode . ("some-sass-language-server" "--stdio"))) + (add-to-list 'eglot-server-programs + '(typescript-ts-mode . ("tsc" "--lsp" "--stdio"))) + (add-to-list 'eglot-server-programs + '((html-mode mhtml-mode) . my/angular-language-server-command))) + +;; roslyn: pick a solution on connect, open it via solution/open +(defun my/roslyn-solutions (root) + "All .sln/.slnx files tracked in the repo at ROOT (repo-relative)." + (let ((default-directory root)) + (split-string + (shell-command-to-string "git ls-files -z -- \"*.sln\" \"*.slnx\"") + "\0" t))) + +(defun my/roslyn-open-solution (&optional server) + "Pick a solution via the minibuffer and open it in the Roslyn SERVER." + (interactive) + (let* ((server (or server (eglot-current-server) + (user-error "No eglot server in this buffer"))) + (root (project-root (eglot--project server))) + (sols (my/roslyn-solutions root))) + (if (null sols) + (message "Roslyn: no .sln/.slnx found under %s" root) + (let ((choice (completing-read "Open solution: " sols nil t))) + (jsonrpc-notify server :solution/open + (list :solution + (eglot-path-to-uri (expand-file-name choice root)))) + (message "Roslyn: opening %s" choice))))) + +(with-eval-after-load 'eglot + (keymap-set eglot-mode-map "C-c s" #'my/roslyn-open-solution)) ;; window-management (use-package zoom-window @@ -61,7 +182,7 @@ :config (setq zoom-window-mode-line-color "DarkGreen")) -(define-key global-map (kbd "C-x w w") 'zoom-window-zoom) -(global-set-key (kbd "C-c C-c") 'comment-line) +(define-key global-map (kbd "C-c w") 'zoom-window-zoom) +(global-set-key (kbd "C-c c") 'comment-line) -(load-theme 'modus-vivendi-tinted) +(load-theme 'modus-operandi)