From ec91954c6164251135e47c0dd8ed69be6c58acaf Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Wed, 17 Aug 2022 08:54:45 +0700 Subject: [PATCH] Emacs tree sitter, dired dwim, lsp/eglot --- .emacs.vanilla/init.el | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.emacs.vanilla/init.el b/.emacs.vanilla/init.el index ef6f8e9..d4693f7 100644 --- a/.emacs.vanilla/init.el +++ b/.emacs.vanilla/init.el @@ -136,7 +136,7 @@ all of the evil keybindings in buffers like magit, without compromises." '(flycheck-color-mode-line-face-to-color 'mode-line-buffer-id) '(frame-background-mode 'dark) '(package-selected-packages - '(consult-eglot eglot lsp-ui nano-modeline mini-modeline simple-modeline dimmer pdf-tools dap-mode csharp-mode consult-lsp lsp-mode consult flycheck all-the-icons-completion kind-icon mini-modeline good-scroll shelldon pcomplete-extension corfu-doc esh-autosuggest fish-completion cape corfu highlight-quoted writeroom-mode mini-frame dirvish ranger evil-goggles magit multi-vterm evil-collection smartparens vterm all-the-icons-dired all-the-icons org-bullets select-themes fsharp-mode fish-mode find-file-in-project helpful ahk-mode rainbow-delimiters doom-themes marginalia selectrum-prescient prescient selectrum avy evil-commentary evil-embrace evil-snipe evil-surround undo-tree which-key dashboard)) + '(eglot-fsharp evil-textobj-tree-sitter tree-sitter-langs tree-sitter consult-eglot eglot lsp-ui nano-modeline mini-modeline simple-modeline dimmer pdf-tools dap-mode csharp-mode consult-lsp lsp-mode consult flycheck all-the-icons-completion kind-icon mini-modeline good-scroll shelldon pcomplete-extension corfu-doc esh-autosuggest fish-completion cape corfu highlight-quoted writeroom-mode mini-frame dirvish ranger evil-goggles magit multi-vterm evil-collection smartparens vterm all-the-icons-dired all-the-icons org-bullets select-themes fsharp-mode fish-mode find-file-in-project helpful ahk-mode rainbow-delimiters doom-themes marginalia selectrum-prescient prescient selectrum avy evil-commentary evil-embrace evil-snipe evil-surround undo-tree which-key dashboard)) '(window-divider-mode nil)) (custom-set-faces ;; custom-set-faces was added by Custom. @@ -179,6 +179,7 @@ all of the evil keybindings in buffers like magit, without compromises." (if (eq system-type 'windows-nt) (setq ls-lisp-dirs-first t) (setq dired-listing-switches "-ahlgo -v --group-directories-first")) +(setq dired-dwim-target t) ;; (require 'dimmer) ;; (setq dimmer-adjustment-mode :both) @@ -505,7 +506,7 @@ all of the evil keybindings in buffers like magit, without compromises." (define-key corfu-map (kbd "M-p") #'corfu-doc-scroll-down) (define-key corfu-map (kbd "M-n") #'corfu-doc-scroll-up) -;; (require 'lsp) +(require 'lsp) (require 'consult) ;; (require 'consult-lsp) (require 'dap-mode) @@ -514,10 +515,23 @@ all of the evil keybindings in buffers like magit, without compromises." (setq dap-print-io t) (require 'eglot) +(require 'eglot-fsharp) (require 'consult-eglot) (defun joe/compile () (interactive) (compile "make run")) +(require 'tree-sitter) +(require 'tree-sitter-langs) +(require 'evil-textobj-tree-sitter) +(define-key evil-outer-text-objects-map "f" (evil-textobj-tree-sitter-get-textobj "function.outer")) +(define-key evil-inner-text-objects-map "f" (evil-textobj-tree-sitter-get-textobj "function.inner")) +(define-key evil-normal-state-map (kbd "]f") (lambda () + (interactive) + (evil-textobj-tree-sitter-goto-textobj "function.outer"))) +(define-key evil-normal-state-map (kbd "[f") (lambda () + (interactive) + (evil-textobj-tree-sitter-goto-textobj "function.outer" t))) + ;; (dap-register-debug-template "NetCoreDdg Launch (4)" ;; (list :type "coreclr" ;; :request "launch"