A bunch of changes

This commit is contained in:
2023-02-07 20:16:58 -08:00
parent 1cbcabc97b
commit 74898aacff
2 changed files with 96 additions and 135 deletions

View File

@ -2,47 +2,40 @@
(import-macros {: bind!} :macros)
(fn on-attach [_ buf]
(fn on-attach [client buf]
((. (. (require :cmp) :setup) :buffer) {
:sources [{ :name "nvim_lsp" :priority 1 :group 1 }
{ :name "snippy" :priority 1 :group 2 }
{ :name "buffer" :priority 0 :group 3 }
{ :name "path" :priority 0 :group 4 }]})
(bind! :n :gD vim.lsp.buf.declaration buf)
;; (bind! :n :gd vim.lsp.buf.definition buf)
; (bind! :n :gd vim.lsp.buf.definition buf)
(bind! :n :K vim.lsp.buf.hover buf)
;; (bind! :n :gI vim.lsp.buf.implementation buf)
; (bind! :n :gI vim.lsp.buf.implementation buf)
(bind! :n :<C-k> vim.lsp.buf.signature_help buf)
(bind! :n :<leader>wa vim.lsp.buf.add_workspace_folder buf)
(bind! :n :<leader>wr vim.lsp.buf.remove_workspace_folder buf)
(bind! :n :<leader>wl #(print (vim.inspect
(vim.lsp.buf.list_workspace_folders))) buf)
(bind! :n :<leader>D vim.lsp.buf.type_definition buf)
; (bind! :n :<leader>D vim.lsp.buf.type_definition buf)
(bind! :n :<leader>rn vim.lsp.buf.rename buf)
(bind! :n :<leader>cn vim.lsp.buf.code_action buf)
; (bind! :n :gr vim.lsp.buf.references buf)
; (bind! :n :<leader>o #(vim.lsp.buf.format { :async true }) buf)
;; Some fzf commands
;(bind! :n :gr "<cmd>FzfLua lsp_references<cr>" buf)
;(bind! :n :<leader>s "<cmd>FzfLua lsp_live_workspace_symbols<cr>" buf)
;(bind! :n :<leader>fs "<cmd>FzfLua lsp_live_workspace_symbols<cr>" buf)
;(bind! :n :<leader>fS "<cmd>FzfLua lsp_workspace_symbols<cr>" buf)
;(bind! :n :<leader>d "<cmd>FzfLua lsp_document_symbols<cr>" buf)
;(bind! :n :<leader>fd "<cmd>FzfLua lsp_document_symbols<cr>" buf)
;(bind! :n :<leader>cn "<cmd>FzfLua lsp_code_actions<cr>" buf)
;(when client.server_capabilities.documentFormattingProvider
; (bind! :n :<leader>o #(vim.lsp.buf.format { :async true }) buf))
;; Some telescope commands
(let [builtin (require :telescope.builtin)]
(bind! :n :gr builtin.lsp_references buf)
(bind! :n :<leader>s builtin.lsp_live_workspace_symbols buf)
(bind! :n :<leader>fs builtin.lsp_live_workspace_symbols buf)
(bind! :n :<leader>fS builtin.lsp_workspace_symbols buf)
(bind! :n :<leader>d builtin.lsp_document_symbols buf)
(bind! :n :<leader>fd builtin.lsp_document_symbols buf)
(bind! :n :<leader>cn builtin.lsp_code_actions buf)
(bind! :n :gd vim.lsp.buf.definition buf)
(bind! :n :gI vim.lsp.buf.implementation buf)))
(bind! :n :<leader>s "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>" buf)
(bind! :n :<leader>fs "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>" buf)
(bind! :n :<leader>fS "<cmd>Telescope lsp_workspace_symbols<cr>" buf)
;(print (vim.inspect client.server_capabilities))
(when client.server_capabilities.documentSymbolProvider
(bind! :n :<leader>d "<cmd>Telescope lsp_document_symbols<cr>" buf)
(bind! :n :<leader>fd "<cmd>Telescope lsp_document_symbols<cr>" buf))
(bind! :n :gr "<cmd>Telescope lsp_references<cr>" buf)
(bind! :n :gd "<cmd>Telescope lsp_definitions<cr>" buf)
(bind! :n :gI "<cmd>Telescope lsp_implementations<cr>" buf)
(bind! :n :D "<cmd>Telescope lsp_type_definitions<cr>" buf))
(fn get-data-dir [server root]