From 56cf8a926bd67516df3ae73739a03da6e0e34a70 Mon Sep 17 00:00:00 2001 From: Daniil Tsivinsky Date: Thu, 23 Dec 2021 22:31:56 +0300 Subject: [PATCH] Use Neoformat for everything, it works --- config/nvim/init.lua | 3 +-- config/nvim/lua/lsp.lua | 46 +++++------------------------------------ 2 files changed, 6 insertions(+), 43 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 3349972..10f8a9c 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -106,8 +106,7 @@ autocmd FileType go set noexpandtab vim.g.mapleader = " " -vim.cmd( - [[autocmd BufWritePre *.js,*.jsx,*.ts,*.tsx,*.html,*.css,*.scss,*.json undojoin | Neoformat]]) +vim.cmd([[autocmd BufWritePre * Neoformat]]) require("lsp") diff --git a/config/nvim/lua/lsp.lua b/config/nvim/lua/lsp.lua index 5a3b6a5..5937a84 100644 --- a/config/nvim/lua/lsp.lua +++ b/config/nvim/lua/lsp.lua @@ -142,50 +142,14 @@ nvim_lsp.gopls.setup({ capabilities = capabilities, on_attach = function() setupLspSignature() end, settings = { - gopls = { - experimentalPostfixCompletions = true, - analyses = { - unusedparams = true, - shadow = true - }, - staticcheck = true - } + gopls = { + experimentalPostfixCompletions = true, + analyses = {unusedparams = true, shadow = true}, + staticcheck = true + } } }) -function goimports(timeout_ms) - local context = { only = { "source.organizeImports" } } - vim.validate { context = { context, "t", true } } - - local params = vim.lsp.util.make_range_params() - params.context = context - - -- See the implementation of the textDocument/codeAction callback - -- (lua/vim/lsp/handler.lua) for how to do this properly. - local result = vim.lsp.buf_request_sync(0, "textDocument/codeAction", params, timeout_ms) - if not result or next(result) == nil then return end - local actions = result[1].result - if not actions then return end - local action = actions[1] - - -- textDocument/codeAction can return either Command[] or CodeAction[]. If it - -- is a CodeAction, it can have either an edit, a command or both. Edits - -- should be executed first. - if action.edit or type(action.command) == "table" then - if action.edit then - vim.lsp.util.apply_workspace_edit(action.edit) - end - if type(action.command) == "table" then - vim.lsp.buf.execute_command(action.command) - end - else - vim.lsp.buf.execute_command(action) - end -end - -vim.cmd([[autocmd BufWritePre *.go lua vim.lsp.buf.formatting_sync()]]) -vim.cmd([[autocmd BufWritePre *.go lua goimports(1000)]]) - require("luasnip/loaders/from_vscode").load({ include = {"javascript", "typescript", "go", "html"} })