mirror of
https://github.com/LunarVim/LunarVim.git
synced 2024-09-21 02:55:09 +02:00
fix autoformatting
This commit is contained in:
parent
a84f5eb36b
commit
e541ef5482
5 changed files with 38 additions and 25 deletions
|
@ -9,7 +9,7 @@ require'lspconfig'.gopls.setup {
|
|||
if O.lang.go.autoformat then
|
||||
require('lv-utils').define_augroups({
|
||||
_go_format = {
|
||||
'BufWritePre', '*.go', 'lua vim.lsp.buf.formatting_sync(nil,1000)'
|
||||
{'BufWritePre', '*.go', 'lua vim.lsp.buf.formatting_sync(nil,1000)'}
|
||||
},
|
||||
_go = {
|
||||
-- Go generally requires Tabs instead of spaces.
|
||||
|
|
|
@ -25,31 +25,43 @@ require'lspconfig'.tsserver.setup {
|
|||
"jsconfig.json", ".git"),
|
||||
settings = {documentFormatting = false},
|
||||
handlers = {
|
||||
["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic
|
||||
.on_publish_diagnostics,
|
||||
{
|
||||
virtual_text = O.lang.tsserver.diagnostics.virtual_text,
|
||||
signs = O.lang.tsserver.diagnostics.signs,
|
||||
underline = O.lang.tsserver.diagnostics.underline,
|
||||
update_in_insert = true
|
||||
["textDocument/publishDiagnostics"] = vim.lsp.with(
|
||||
vim.lsp.diagnostic.on_publish_diagnostics, {
|
||||
virtual_text = O.lang.tsserver.diagnostics.virtual_text,
|
||||
signs = O.lang.tsserver.diagnostics.signs,
|
||||
underline = O.lang.tsserver.diagnostics.underline,
|
||||
update_in_insert = true
|
||||
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
if O.lang.tsserver.autoformat then
|
||||
require('lv-utils').define_augroups({
|
||||
_javascript_autoformat = {
|
||||
'BufWritePre', '*.js', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'
|
||||
{
|
||||
|
||||
'BufWritePre', '*.js',
|
||||
'lua vim.lsp.buf.formatting_sync(nil, 1000)'
|
||||
}
|
||||
},
|
||||
_javascriptreact_autoformat = {
|
||||
'BufWritePre', '*.jsx', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'
|
||||
{
|
||||
'BufWritePre', '*.jsx',
|
||||
'lua vim.lsp.buf.formatting_sync(nil, 1000)'
|
||||
}
|
||||
},
|
||||
_typescript_autoformat = {
|
||||
'BufWritePre', '*.ts', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'
|
||||
{
|
||||
'BufWritePre', '*.ts',
|
||||
'lua vim.lsp.buf.formatting_sync(nil, 1000)'
|
||||
}
|
||||
},
|
||||
_typescriptreact_autoformat = {
|
||||
'BufWritePre', '*.tsx', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'
|
||||
{
|
||||
'BufWritePre', '*.tsx',
|
||||
'lua vim.lsp.buf.formatting_sync(nil, 1000)'
|
||||
}
|
||||
}
|
||||
})
|
||||
end
|
||||
|
|
|
@ -19,8 +19,10 @@ require'lspconfig'.jsonls.setup {
|
|||
if O.lang.json.autoformat then
|
||||
require('lv-utils').define_augroups({
|
||||
_json_format = {
|
||||
'BufWritePre', '*.json',
|
||||
'lua vim.lsp.buf.formatting_sync(nil, 1000)'
|
||||
{
|
||||
'BufWritePre', '*.json',
|
||||
'lua vim.lsp.buf.formatting_sync(nil, 1000)'
|
||||
}
|
||||
}
|
||||
})
|
||||
end
|
||||
|
|
|
@ -3,15 +3,14 @@ require'lspconfig'.solargraph.setup {
|
|||
cmd = {DATA_PATH .. "/lspinstall/ruby/solargraph/solargraph", "--stdio"},
|
||||
on_attach = require'lsp'.common_on_attach,
|
||||
handlers = {
|
||||
["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic
|
||||
.on_publish_diagnostics,
|
||||
{
|
||||
virtual_text = O.lang.ruby.diagnostics.virtual_text,
|
||||
signs = O.lang.ruby.diagnostics.signs,
|
||||
underline = O.lang.ruby.diagnostics.underline,
|
||||
update_in_insert = true
|
||||
["textDocument/publishDiagnostics"] = vim.lsp.with(
|
||||
vim.lsp.diagnostic.on_publish_diagnostics, {
|
||||
virtual_text = O.lang.ruby.diagnostics.virtual_text,
|
||||
signs = O.lang.ruby.diagnostics.signs,
|
||||
underline = O.lang.ruby.diagnostics.underline,
|
||||
update_in_insert = true
|
||||
|
||||
})
|
||||
})
|
||||
},
|
||||
filetypes = O.lang.ruby.filetypes
|
||||
}
|
||||
|
@ -19,7 +18,7 @@ require'lspconfig'.solargraph.setup {
|
|||
if O.lang.ruby.autoformat then
|
||||
require('lv-utils').define_augroups({
|
||||
_ruby_format = {
|
||||
'BufWritePre', '*.rb', 'lua vim.lsp.buf.formatting_sync(nil,1000)'
|
||||
{'BufWritePre', '*.rb', 'lua vim.lsp.buf.formatting_sync(nil,1000)'}
|
||||
}
|
||||
})
|
||||
end
|
||||
|
|
|
@ -80,7 +80,7 @@ vim.api.nvim_exec([[
|
|||
if O.lang.rust.autoformat then
|
||||
require('lv-utils').define_augroups({
|
||||
_rust_format = {
|
||||
'BufWritePre', '*.rs', 'lua vim.lsp.buf.formatting_sync(nil,1000)'
|
||||
{'BufWritePre', '*.rs', 'lua vim.lsp.buf.formatting_sync(nil,1000)'}
|
||||
}
|
||||
})
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue