diff --git a/lua/taken/plugins/lsp/ts-tools.lua b/lua/taken/plugins/lsp/ts-tools.lua index 8d8206b..9ab7ebf 100644 --- a/lua/taken/plugins/lsp/ts-tools.lua +++ b/lua/taken/plugins/lsp/ts-tools.lua @@ -1,6 +1,7 @@ return { "pmizio/typescript-tools.nvim", dependencies = { + "lvimuser/lsp-inlayhints.nvim", "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig", "hrsh7th/cmp-nvim-lsp", @@ -8,10 +9,27 @@ return { config = function() local typescript_tools = require("typescript-tools") local cmp_nvim_lsp = require("cmp_nvim_lsp") + local lsp_inlayhints = require("lsp-inlayhints") local on_attach = require("taken.core.on_attach") local capabilities = cmp_nvim_lsp.default_capabilities() + lsp_inlayhints.setup({}) + + vim.api.nvim_create_augroup("LspAttach_inlayhints", {}) + vim.api.nvim_create_autocmd("LspAttach", { + group = "LspAttach_inlayhints", + callback = function(args) + if not (args.data and args.data.client_id) then + return + end + + local bufnr = args.buf + local client = vim.lsp.get_client_by_id(args.data.client_id) + require("lsp-inlayhints").on_attach(client, bufnr) + end, + }) + typescript_tools.setup({ capabilities = capabilities, on_attach = on_attach, @@ -21,6 +39,18 @@ return { includeCompletionsForModuleExports = true, quotePreference = "auto", }, + javascript = { + inlayHints = { + includeInlayParameterNameHints = "all", + includeInlayParameterNameHintsWhenArgumentMatchesName = false, + includeInlayFunctionParameterTypeHints = true, + includeInlayVariableTypeHints = true, + includeInlayVariableTypeHintsWhenTypeMatchesName = false, + includeInlayPropertyDeclarationTypeHints = true, + includeInlayFunctionLikeReturnTypeHints = true, + includeInlayEnumMemberValueHints = true, + }, + }, }, }) end,