Skip to content

Commit

Permalink
neovim: only add bindings when attached
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonrw
simonrw committed Jan 6, 2025
1 parent 895952c commit 3f23b08
Show file tree
Hide file tree
Showing 2 changed files with 121 additions and 152 deletions.
1 change: 1 addition & 0 deletions home/neovim/lua/plugins/blink.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ return {
nerd_font_variant = 'mono'
},

-- enable signature
signature = { enabled = true },

-- Default list of enabled providers defined so that you can extend it
Expand Down
272 changes: 120 additions & 152 deletions home/neovim/lua/plugins/lsp.lua
View file
Original file line number Diff line number Diff line change
@@ -1,167 +1,135 @@
return {
{
"neovim/nvim-lspconfig",
dependencies = {
'saghen/blink.cmp',
{
"folke/lazydev.nvim",
ft = "lua", -- only load on lua files
opts = {
library = {
-- See the configuration section for more details
-- Load luvit types when the `vim.uv` word is found
{path = "${3rd}/luv/library", words = {"vim%.uv"}}
}
}
{
"neovim/nvim-lspconfig",
dependencies = {
'saghen/blink.cmp',
{
"folke/lazydev.nvim",
ft = "lua", -- only load on lua files
opts = {
library = {
-- See the configuration section for more details
-- Load luvit types when the `vim.uv` word is found
{ path = "${3rd}/luv/library", words = { "vim%.uv" } }
}
}
},
},
config = function()
local capabilities = require("blink.cmp").get_lsp_capabilities()
local lspServers = {
{
extraOptions = {
filetypes = {
"javascript", "javascriptreact", "javascript.jsx",
"typescript", "typescriptreact", "typescript.tsx"
},
},
config = function()
local lspServers = {
{
extraOptions = {
filetypes = {
"javascript", "javascriptreact", "javascript.jsx",
"typescript", "typescriptreact", "typescript.tsx"
},
settings = {
javascript = {format = {indentSize = 2}},
typescript = {format = {indentSize = 2}}
}
},
name = "ts_ls"
}, {
extraOptions = {
on_attach = function(client, bufnr)
client.config.settings.useLibraryCodeForTypes =
false
client.config.settings.autoSearchPaths = false
client.config.settings
.reportTypedDictNotRequiredAccess = "warning"
client.config.settings.reportGeneralTypeIssues =
"warning"
client.config.settings.reportUnusedCallResult =
false
client.config.settings.reportAny = false
client.config.settings.reportOptionalMemberAccess =
false
client.config.settings.reportUnknownMemberType =
false
client.config.settings.reportUnknownArgumentType =
false
client.config.settings.reportUnknownVariableType =
false
end
},
name = "pyright"
},
{name = "gopls"},
{name = "gleam"},
{name = "elmls"},
{name = "lua_ls"},
{name = "zls"},
{name = "terraformls"},
settings = {
javascript = { format = { indentSize = 2 } },
typescript = { format = { indentSize = 2 } }
}
},
name = "ts_ls"
}, {
extraOptions = {
on_attach = function(client, bufnr)
client.config.settings.useLibraryCodeForTypes =
false
client.config.settings.autoSearchPaths = false
client.config.settings
.reportTypedDictNotRequiredAccess = "warning"
client.config.settings.reportGeneralTypeIssues =
"warning"
client.config.settings.reportUnusedCallResult =
false
client.config.settings.reportAny = false
client.config.settings.reportOptionalMemberAccess =
false
client.config.settings.reportUnknownMemberType =
false
client.config.settings.reportUnknownArgumentType =
false
client.config.settings.reportUnknownVariableType =
false
end
},
name = "pyright"
},
{ name = "gopls" },
{ name = "gleam" },
{ name = "elmls" },
{ name = "lua_ls" },
{ name = "zls" },
{ name = "terraformls" },
}

local setup = {
on_attach = function(client, bufnr) end,
}
local setup = {
on_attach = function(client, bufnr) end,
}

for _, server in ipairs(lspServers) do
if type(server) == "string" then
require("lspconfig")[server].setup(setup)
else
local options = server.extraOptions
for _, server in ipairs(lspServers) do
if type(server) == "string" then
require("lspconfig")[server].setup(setup)
else
local options = server.extraOptions

if options == nil then
options = setup
else
options = vim.tbl_extend("keep", options, setup)
end
if options == nil then
options = setup
else
options = vim.tbl_extend("keep", options, setup)
end

require("lspconfig")[server.name].setup(options)
end
end
require("lspconfig")[server.name].setup(options)
end
end

-- require("lspconfig").lua_ls.setup {}
-- require("lspconfig").ts_ls.setup {}
-- require("lspconfig").rust_analyzer.setup {}
--
local __binds = {
{
action = vim.lsp.buf.type_definition,
key = "gy",
mode = "n",
options = {noremap = true, silent = true}
}, {
action = vim.lsp.buf.implementation,
key = "gi",
mode = "n",
options = {noremap = true, silent = true}
}, {
action = vim.lsp.buf.hover,
key = "<leader>k",
mode = "n",
options = {noremap = true, silent = true}
}, {
action = vim.lsp.buf.rename,
key = "<leader>r",
mode = "n",
options = {noremap = true, silent = true}
}, {
action = vim.diagnostic.goto_next,
key = "]d",
mode = "n",
options = {noremap = true, silent = true}
}, {
action = vim.diagnostic.goto_prev,
key = "[d",
mode = "n",
options = {noremap = true, silent = true}
}, {
action = function()
vim.lsp.buf.code_action({
source = {organizeImports = true}
})
end,
key = "<leader>a",
mode = "n",
options = {noremap = true, silent = true}
}, {
action = vim.lsp.buf.signature_help,
key = "<C-h>",
mode = "i",
options = {noremap = true, silent = true}
}
}
vim.lsp.inlay_hint.enable()

-- configure signs
-- from: https://rsdlt.github.io/posts/rust-nvim-ide-guide-walkthrough-development-debug/
local sign = function(opts)
vim.fn.sign_define(opts.name,
{ texthl = opts.name, text = opts.text, numhl = '' })
end

for _, map in ipairs(__binds) do
vim.keymap.set(map.mode, map.key, map.action, map.options)
end
sign({ name = 'DiagnosticSignError', text = '' })
sign({ name = 'DiagnosticSignWarn', text = '' })
sign({ name = 'DiagnosticSignHint', text = '' })
sign({ name = 'DiagnosticSignInfo', text = '' })

vim.lsp.inlay_hint.enable()
-- configure diagnostics
-- from: https://rsdlt.github.io/posts/rust-nvim-ide-guide-walkthrough-development-debug/
vim.diagnostic.config({
virtual_text = false,
signs = true,
update_in_insert = true,
underline = false,
severity_sort = false,
float = { border = 'rounded', source = true, header = '', prefix = '' }
})

-- configure signs
-- from: https://rsdlt.github.io/posts/rust-nvim-ide-guide-walkthrough-development-debug/
local sign = function(opts)
vim.fn.sign_define(opts.name,
{texthl = opts.name, text = opts.text, numhl = ''})
end
vim.api.nvim_create_autocmd("LspAttach", {
callback = function(args)
local buf = args.buf

sign({name = 'DiagnosticSignError', text = ''})
sign({name = 'DiagnosticSignWarn', text = ''})
sign({name = 'DiagnosticSignHint', text = ''})
sign({name = 'DiagnosticSignInfo', text = ''})
local c = vim.lsp.get_client_by_id(args.data.client_id)
if not c then return end

-- configure diagnostics
-- from: https://rsdlt.github.io/posts/rust-nvim-ide-guide-walkthrough-development-debug/
vim.diagnostic.config({
virtual_text = false,
signs = true,
update_in_insert = true,
underline = false,
severity_sort = false,
float = {border = 'rounded', source = true, header = '', prefix = ''}
-- set up keybinds
vim.keymap.set("n", "gy", vim.lsp.buf.type_definition, { noremap = true, silent = true, buffer = buf })
vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { noremap = true, silent = true, buffer = buf })
vim.keymap.set("n", "<leader>k", vim.lsp.buf.hover, { noremap = true, silent = true, buffer = buf })
vim.keymap.set("n", "<leader>r", vim.lsp.buf.rename, { noremap = true, silent = true, buffer = buf })
vim.keymap.set("n", "]d", vim.diagnostic.goto_next, { noremap = true, silent = true, buffer = buf })
vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, { noremap = true, silent = true, buffer = buf })
vim.keymap.set("n", "<C-h>", vim.lsp.buf.signature_help, { noremap = true, silent = true, buffer = buf })
vim.keymap.set("n", "<leader>a", function()
vim.lsp.buf.code_action({
source = { organizeImports = true }
})
end
}
end, { noremap = true, silent = true, buffer = buf })
end,
})
end
}
}

0 comments on commit 3f23b08

Please sign in to comment.