From eeec0c70a83309d557fb59e97a385b11b3b52ca1 Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Tue, 5 Nov 2024 21:39:31 +0100
Subject: [PATCH] feat: add inlay highlights
---
init.lua | 1 +
lazy-lock.json | 41 ++++++++++++++++---------------
lua/nvim-lsp-config.lua | 53 +++++++++++++++++++++++++++++++----------
lua/plugins.lua | 21 ++++++++++++++--
4 files changed, 83 insertions(+), 33 deletions(-)
diff --git a/init.lua b/init.lua
index ccd195b..198f6c7 100644
--- a/init.lua
+++ b/init.lua
@@ -67,6 +67,7 @@ vim.cmd([[
highlight NonText guibg=none ctermbg=none
highlight LineNr guifg=#606060
highlight SignColumn guibg=none ctermbg=none
+ highlight LspInlayHint guifg=#a520ff guibg=none ctermbg=none
]])
require("notify").setup({
diff --git a/lazy-lock.json b/lazy-lock.json
index 3b37619..a1592c5 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,40 +1,43 @@
{
- "barbar.nvim": { "branch": "master", "commit": "a3ebfe0c382fc5393b3c0cef96d58c6c49492562" },
+ "barbar.nvim": { "branch": "master", "commit": "7c28de8c22f4c00ed43a78ae16c13dd6a248fe1a" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
- "cmp-git": { "branch": "main", "commit": "50d526dff0f6bc441b51fc269d9fdc99a50c76af" },
+ "cmp-git": { "branch": "main", "commit": "ec049036e354ed8ed0215f2427112882e1ea7051" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
"direnv.vim": { "branch": "master", "commit": "ab2a7e08dd630060cd81d7946739ac7442a4f269" },
- "dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
- "formatter.nvim": { "branch": "master", "commit": "ad246d34ce7a32f752071ed81b09b94e6b127fad" },
- "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" },
+ "dressing.nvim": { "branch": "master", "commit": "6ef1ca479d37d4ff66f13eed44d08912caff483a" },
+ "formatter.nvim": { "branch": "master", "commit": "eb89a1f3e079f1b9680bc7293b75fffccb5e1598" },
+ "gitsigns.nvim": { "branch": "main", "commit": "4daf7022f1481edf1e8fb9947df13bb07c18e89a" },
"incline.nvim": { "branch": "main", "commit": "16fc9c073e3ea4175b66ad94375df6d73fc114c0" },
- "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" },
- "lsp-zero.nvim": { "branch": "v4.x", "commit": "b8411704591ae8e1501f1b9b31c801c09927baac" },
- "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
+ "inlay-hint.nvim": { "branch": "main", "commit": "eb5f0579537db271dfedd7f38460cdacb238176f" },
+ "lazy.nvim": { "branch": "main", "commit": "b1134ab82ee4279e31f7ddf7e34b2a99eb9b7bc9" },
+ "lazydev.nvim": { "branch": "main", "commit": "d5800897d9180cea800023f2429bce0a94ed6064" },
+ "lsp-zero.nvim": { "branch": "v4.x", "commit": "19a8b90340c6c522219c84f7befe784d657ab28e" },
+ "lualine.nvim": { "branch": "master", "commit": "640260d7c2d98779cab89b1e7088ab14ea354a02" },
+ "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
"mini.cursorword": { "branch": "main", "commit": "7d1b38a17834acbbc4feff8e42aedc4ed0c6ff06" },
"mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" },
- "nerdcommenter": { "branch": "master", "commit": "3f860f2d981547c18f2c9599e3c358ea488c3be4" },
- "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
- "nvim-lspconfig": { "branch": "master", "commit": "b064131428f6bbbbc905f4451ba6779fda334a3a" },
- "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
- "nvim-treesitter": { "branch": "master", "commit": "b8ad0473f4d5d7b59e17a67ad0b68711b0232486" },
- "nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" },
+ "nerdcommenter": { "branch": "master", "commit": "66c07e4083ab02ed2540ac289cc602c70b858c13" },
+ "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
+ "nvim-lspconfig": { "branch": "master", "commit": "bc6ada4b0892b7f10852c0b8ca7209fd39a6d754" },
+ "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
+ "nvim-treesitter": { "branch": "master", "commit": "7dc8aabe86db8c2f23520e8334f7584f83e84342" },
+ "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
- "telescope-file-browser.nvim": { "branch": "master", "commit": "3b8a1e17187cfeedb31decbd625da62398a8ff34" },
- "telescope.nvim": { "branch": "master", "commit": "b5fd7f7ae0ea4537511077ed8ef4a6021cedba2f" },
+ "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
+ "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
"tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "d10c9fda7b8b7b81b2c6eb4c3909adfe9812c6bf" },
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
"toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" },
- "tokyonight.nvim": { "branch": "main", "commit": "2c85fad417170d4572ead7bf9fdd706057bd73d7" },
- "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
+ "tokyonight.nvim": { "branch": "main", "commit": "ce91ba480070c95f40753e4663e32b4632ac6db3" },
+ "trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" },
"vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" },
"vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" },
"virt-column.nvim": { "branch": "master", "commit": "b62b4ef0774d19452d4ed18e473e824c7a756f2f" },
- "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" }
+ "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
}
diff --git a/lua/nvim-lsp-config.lua b/lua/nvim-lsp-config.lua
index 225daf7..517f4e5 100644
--- a/lua/nvim-lsp-config.lua
+++ b/lua/nvim-lsp-config.lua
@@ -1,16 +1,5 @@
-local lsp_zero = require("lsp-zero")
local lspconfig = require("lspconfig")
--- https://lsp-zero.netlify.app/v3.x/language-server-configuration.html
-
-lsp_zero.on_attach(function(_, bufnr)
- -- see :help lsp-zero-keybindings
- -- to learn the available actions
- lsp_zero.default_keymaps({ buffer = bufnr })
-end)
-
--- set up language servers
-
--vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
--virtual_text = true,
--})
@@ -27,7 +16,34 @@ lspconfig.r_language_server.setup({})
lspconfig.qmlls.setup({})
-lspconfig.lua_ls.setup(lsp_zero.nvim_lua_ls())
+lspconfig.lua_ls.setup({
+ on_init = function(client)
+ if client.workspace_folders then
+ local path = client.workspace_folders[1].name
+ if vim.uv.fs_stat(path .. "/.luarc.json") or vim.uv.fs_stat(path .. "/.luarc.jsonc") then
+ return
+ end
+ end
+
+ client.config.settings.Lua = vim.tbl_deep_extend("force", client.config.settings.Lua, {
+ runtime = {
+ version = "LuaJIT",
+ },
+ workspace = {
+ checkThirdParty = false,
+ library = {
+ vim.env.VIMRUNTIME,
+ },
+ },
+ })
+ end,
+ settings = {
+ Lua = {
+ hint = { enable = true },
+ },
+ },
+ single_file_support = true,
+})
lspconfig.bashls.setup({})
@@ -38,3 +54,16 @@ lspconfig.ts_ls.setup({})
lspconfig.tinymist.setup({
single_file_support = true,
})
+
+vim.api.nvim_create_autocmd("LspAttach", {
+ callback = function(args)
+ local bufnr = args.buf ---@type number
+ local client = vim.lsp.get_client_by_id(args.data.client_id)
+ if client.supports_method("textDocument/inlayHint") then
+ vim.lsp.inlay_hint.enable(true, { bufnr = bufnr })
+ vim.keymap.set("n", "<leader>i", function()
+ vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = bufnr }), { bufnr = bufnr })
+ end, { buffer = bufnr })
+ end
+ end,
+})
diff --git a/lua/plugins.lua b/lua/plugins.lua
index ecb5dc4..a2062ea 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -7,7 +7,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
"clone",
"--filter=blob:none",
"https://github.com/folke/lazy.nvim.git",
- "--branch=stable", -- latest stable release
+ "--branch=stable",
lazypath,
})
end
@@ -15,6 +15,16 @@ vim.opt.rtp:prepend(lazypath)
require("lazy").setup({
--: Behaviour {{{
+ {
+ "folke/lazydev.nvim",
+ ft = "lua",
+ dependencies = { { "Bilal2453/luvit-meta", lazy = true } },
+ opts = {
+ library = {
+ { path = "luvit-meta/library", words = { "vim%.uv" } },
+ },
+ },
+ },
"mg979/vim-visual-multi",
{
"hrsh7th/nvim-cmp",
@@ -70,7 +80,7 @@ require("lazy").setup({
require("nvim-lsp-config")
end,
},
- "simrat39/rust-tools.nvim",
+ { "simrat39/rust-tools.nvim", ft = "rust" },
"preservim/nerdcommenter", -- (batch)commenting tool
{ -- fuzzy file finder
"nvim-telescope/telescope.nvim",
@@ -159,6 +169,13 @@ require("lazy").setup({
},
--:}}}
--: Visuals {{{
+ {
+ "felpafel/inlay-hint.nvim",
+ event = "LspAttach",
+ config = function()
+ require("inlay-hint").setup()
+ end,
+ },
{
"rachartier/tiny-inline-diagnostic.nvim",
event = "VeryLazy", -- Or `LspAttach`