From 433c1067a166d88cef7d1c12cc0c6180bf497f47 Mon Sep 17 00:00:00 2001 From: Joe Date: Sun, 26 Jun 2022 21:33:40 +0200 Subject: update --- .config/emacs/org/config.org | 92 ++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 45 deletions(-) (limited to '.config/emacs') diff --git a/.config/emacs/org/config.org b/.config/emacs/org/config.org index 5ab3b5b..c008a33 100644 --- a/.config/emacs/org/config.org +++ b/.config/emacs/org/config.org @@ -606,7 +606,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." (define-key markdown-mode-map (kbd "\C-c\C-o") 'toc-org-markdown-follow-thing-at-point) #+END_SRC -*** lsp, ccls, company, yasnippet +*** lsp, ccls, clangd, company, yasnippet #+BEGIN_SRC emacs-lisp (require 'lsp-mode) (require 'lsp-ui) @@ -653,50 +653,52 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." ;; (setq company-transformers nil company-lsp-async t company-lsp-cache-candidates nil) (add-hook 'company-mode-hook 'company-box-mode) - (setq ccls-executable "ccls") - - (defun ccls/callee () (interactive) (lsp-ui-peek-find-custom "$ccls/call" '(:callee t))) - (defun ccls/caller () (interactive) (lsp-ui-peek-find-custom "$ccls/call")) - (defun ccls/vars (kind) (lsp-ui-peek-find-custom "$ccls/vars" `(:kind ,kind))) - (defun ccls/base (levels) (lsp-ui-peek-find-custom "$ccls/inheritance" `(:levels ,levels))) - (defun ccls/derived (levels) (lsp-ui-peek-find-custom "$ccls/inheritance" `(:levels ,levels :derived t))) - (defun ccls/member (kind) (interactive) (lsp-ui-peek-find-custom "$ccls/member" `(:kind ,kind))) - - ;; References w/ Role::Role - (defun ccls/references-read () (interactive) - (lsp-ui-peek-find-custom "textDocument/references" - (plist-put (lsp--text-document-position-params) :role 8))) - - ;; References w/ Role::Write - (defun ccls/references-write () - (interactive) - (lsp-ui-peek-find-custom "textDocument/references" - (plist-put (lsp--text-document-position-params) :role 16))) - - ;; References w/ Role::Dynamic bit (macro expansions) - (defun ccls/references-macro () (interactive) - (lsp-ui-peek-find-custom "textDocument/references" - (plist-put (lsp--text-document-position-params) :role 64))) - - ;; References w/o Role::Call bit (e.g. where functions are taken addresses) - (defun ccls/references-not-call () (interactive) - (lsp-ui-peek-find-custom "textDocument/references" - (plist-put (lsp--text-document-position-params) :excludeRole 32))) - - ;; ccls/vars ccls/base ccls/derived ccls/members have a parameter while others are interactive. - ;; (ccls/base 1) direct bases - ;; (ccls/derived 1) direct derived - ;; (ccls/member 2) => 2 (Type) => nested classes / types in a namespace - ;; (ccls/member 3) => 3 (Func) => member functions / functions in a namespace - ;; (ccls/member 0) => member variables / variables in a namespace - ;; (ccls/vars 1) => field - ;; (ccls/vars 2) => local variable - ;; (ccls/vars 3) => field or local variable. 3 = 1 | 2 - ;; (ccls/vars 4) => parameter - - ;; References whose filenames are under this project - (setq ccls-sem-highlight-method 'overlay) - (ccls-use-default-rainbow-sem-highlight) + (require 'lsp-clangd) + + ;; (setq ccls-executable "ccls") + + ;; (defun ccls/callee () (interactive) (lsp-ui-peek-find-custom "$ccls/call" '(:callee t))) + ;; (defun ccls/caller () (interactive) (lsp-ui-peek-find-custom "$ccls/call")) + ;; (defun ccls/vars (kind) (lsp-ui-peek-find-custom "$ccls/vars" `(:kind ,kind))) + ;; (defun ccls/base (levels) (lsp-ui-peek-find-custom "$ccls/inheritance" `(:levels ,levels))) + ;; (defun ccls/derived (levels) (lsp-ui-peek-find-custom "$ccls/inheritance" `(:levels ,levels :derived t))) + ;; (defun ccls/member (kind) (interactive) (lsp-ui-peek-find-custom "$ccls/member" `(:kind ,kind))) + + ;; ;; References w/ Role::Role + ;; (defun ccls/references-read () (interactive) + ;; (lsp-ui-peek-find-custom "textDocument/references" + ;; (plist-put (lsp--text-document-position-params) :role 8))) + + ;; ;; References w/ Role::Write + ;; (defun ccls/references-write () + ;; (interactive) + ;; (lsp-ui-peek-find-custom "textDocument/references" + ;; (plist-put (lsp--text-document-position-params) :role 16))) + + ;; ;; References w/ Role::Dynamic bit (macro expansions) + ;; (defun ccls/references-macro () (interactive) + ;; (lsp-ui-peek-find-custom "textDocument/references" + ;; (plist-put (lsp--text-document-position-params) :role 64))) + + ;; ;; References w/o Role::Call bit (e.g. where functions are taken addresses) + ;; (defun ccls/references-not-call () (interactive) + ;; (lsp-ui-peek-find-custom "textDocument/references" + ;; (plist-put (lsp--text-document-position-params) :excludeRole 32))) + + ;; ;; ccls/vars ccls/base ccls/derived ccls/members have a parameter while others are interactive. + ;; ;; (ccls/base 1) direct bases + ;; ;; (ccls/derived 1) direct derived + ;; ;; (ccls/member 2) => 2 (Type) => nested classes / types in a namespace + ;; ;; (ccls/member 3) => 3 (Func) => member functions / functions in a namespace + ;; ;; (ccls/member 0) => member variables / variables in a namespace + ;; ;; (ccls/vars 1) => field + ;; ;; (ccls/vars 2) => local variable + ;; ;; (ccls/vars 3) => field or local variable. 3 = 1 | 2 + ;; ;; (ccls/vars 4) => parameter + + ;; ;; References whose filenames are under this project + ;; (setq ccls-sem-highlight-method 'overlay) + ;; (ccls-use-default-rainbow-sem-highlight) #+END_SRC *** diff-hl -- cgit v1.2.3