Fix citre.
This commit is contained in:
parent
e6e6c20c9c
commit
cea7e3ace6
2
.gitignore
vendored
2
.gitignore
vendored
@ -17,4 +17,4 @@ speed-type/
|
|||||||
var/
|
var/
|
||||||
.dap-breakpoints
|
.dap-breakpoints
|
||||||
eclipse.jdt.ls/
|
eclipse.jdt.ls/
|
||||||
workspace/
|
workspace/
|
||||||
|
@ -24,6 +24,12 @@
|
|||||||
(setq citre-auto-enable-citre-mode-modes '(prog-mode))
|
(setq citre-auto-enable-citre-mode-modes '(prog-mode))
|
||||||
:config
|
:config
|
||||||
(with-no-warnings
|
(with-no-warnings
|
||||||
|
(setq citre-readtags-program "/usr/bin/readtags"
|
||||||
|
citre-ctags-program "/usr/bin/ctags"
|
||||||
|
citre-default-create-tags-file-location 'global-cache
|
||||||
|
citre-use-project-root-when-creating-tags t
|
||||||
|
citre-prompt-language-for-ctags-command t)
|
||||||
|
|
||||||
(with-eval-after-load 'projectile
|
(with-eval-after-load 'projectile
|
||||||
(setq citre-project-root-function #'projectile-project-root))
|
(setq citre-project-root-function #'projectile-project-root))
|
||||||
|
|
||||||
@ -41,13 +47,8 @@
|
|||||||
|
|
||||||
(defun lsp-citre-capf-function ()
|
(defun lsp-citre-capf-function ()
|
||||||
"A capf backend that tries lsp first, then Citre."
|
"A capf backend that tries lsp first, then Citre."
|
||||||
(let ((lsp-result (pcase centaur-lsp
|
(let ((lsp-result (if (bound-and-true-p lsp-mode)
|
||||||
('lsp-mode
|
(lsp-completion-at-point))))
|
||||||
(and (fboundp #'lsp-completion-at-point)
|
|
||||||
(lsp-completion-at-point)))
|
|
||||||
('eglot
|
|
||||||
(and (fboundp #'eglot-completion-at-point)
|
|
||||||
(eglot-completion-at-point))))))
|
|
||||||
(if (and lsp-result
|
(if (and lsp-result
|
||||||
(try-completion
|
(try-completion
|
||||||
(buffer-substring (nth 0 lsp-result)
|
(buffer-substring (nth 0 lsp-result)
|
||||||
@ -60,7 +61,8 @@
|
|||||||
"Enable the lsp + Citre capf backend in current buffer."
|
"Enable the lsp + Citre capf backend in current buffer."
|
||||||
(add-hook 'completion-at-point-functions #'lsp-citre-capf-function nil t))
|
(add-hook 'completion-at-point-functions #'lsp-citre-capf-function nil t))
|
||||||
|
|
||||||
(add-hook 'citre-mode-hook #'enable-lsp-citre-capf-backend)))
|
(add-hook 'citre-mode-hook #'enable-lsp-citre-capf-backend)
|
||||||
|
))
|
||||||
|
|
||||||
(provide 'base-ctags)
|
(provide 'base-ctags)
|
||||||
;;; base-ctags.el ends here
|
;;; base-ctags.el ends here
|
||||||
|
Loading…
Reference in New Issue
Block a user