From 5a59dfaada5b7ab4b5c9120e622c42e0e600e42f Mon Sep 17 00:00:00 2001 From: Matt Leong Date: Mon, 6 Dec 2021 06:42:53 -0800 Subject: [PATCH] feat(tsserver): update ts-utils settings to latest --- lua/cosmic/lsp/providers/null_ls.lua | 9 +++++++++ lua/cosmic/lsp/providers/tsserver.lua | 14 +++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lua/cosmic/lsp/providers/null_ls.lua b/lua/cosmic/lsp/providers/null_ls.lua index bea9eea..09d82a6 100644 --- a/lua/cosmic/lsp/providers/null_ls.lua +++ b/lua/cosmic/lsp/providers/null_ls.lua @@ -19,6 +19,15 @@ null_ls.config(vim.tbl_deep_extend('force', { }, }), null_ls.builtins.code_actions.gitsigns, + null_ls.builtins.diagnostics.eslint_d.with({ -- eslint or eslint_d + -- prefer_local = 'node_modules/.bin', + }), + null_ls.builtins.code_actions.eslint_d.with({ -- eslint or eslint_d + -- prefer_local = 'node_modules/.bin', + }), + null_ls.builtins.formatting.prettierd.with({ -- prettier, eslint, eslint_d, or prettierd + -- prefer_local = 'node_modules/.bin', + }), }, }, config_opts or {})) diff --git a/lua/cosmic/lsp/providers/tsserver.lua b/lua/cosmic/lsp/providers/tsserver.lua index 5572bd2..88cb06d 100644 --- a/lua/cosmic/lsp/providers/tsserver.lua +++ b/lua/cosmic/lsp/providers/tsserver.lua @@ -24,17 +24,9 @@ function M.on_attach(client, bufnr) import_all_scan_buffers = 100, import_all_select_source = false, - -- eslint - eslint_enable_code_actions = true, - eslint_enable_disable_comments = true, - eslint_bin = 'eslint_d', - eslint_enable_diagnostics = true, - -- eslint_opts = {}, - - -- formatting - enable_formatting = true, - formatter = 'prettierd', - -- formatter_opts = {}, + -- inlay hints + auto_inlay_hints = true, + inlay_hints_highlight = 'Comment', -- update imports on file move update_imports_on_move = true,