Mirrors/LunarVim
Mirrors/LunarVim
1
0
Fork 0
mirror of https://github.com/LunarVim/LunarVim.git synced 2024-09-21 02:55:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix autoformatting

Browse source
This commit is contained in:
Chris 2021-06-30 22:09:18 -04:00
parent a84f5eb36b
commit e541ef5482
5 changed files with 38 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lua/lsp/go-ls.lua
View file

@ -9,7 +9,7 @@ require'lspconfig'.gopls.setup {
if O.lang.go.autoformat then if O.lang.go.autoformat then
require('lv-utils').define_augroups({ require('lv-utils').define_augroups({
_go_format = { _go_format = {
'BufWritePre', '*.go', 'lua vim.lsp.buf.formatting_sync(nil,1000)' {'BufWritePre', '*.go', 'lua vim.lsp.buf.formatting_sync(nil,1000)'}
}, },
_go = { _go = {
-- Go generally requires Tabs instead of spaces. -- Go generally requires Tabs instead of spaces.

36
lua/lsp/js-ts-ls.lua
View file

@ -25,31 +25,43 @@ require'lspconfig'.tsserver.setup {
"jsconfig.json", ".git"), "jsconfig.json", ".git"),
settings = {documentFormatting = false}, settings = {documentFormatting = false},
handlers = { handlers = {
["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic ["textDocument/publishDiagnostics"] = vim.lsp.with(
.on_publish_diagnostics, vim.lsp.diagnostic.on_publish_diagnostics, {
{ virtual_text = O.lang.tsserver.diagnostics.virtual_text,
virtual_text = O.lang.tsserver.diagnostics.virtual_text, signs = O.lang.tsserver.diagnostics.signs,
signs = O.lang.tsserver.diagnostics.signs, underline = O.lang.tsserver.diagnostics.underline,
underline = O.lang.tsserver.diagnostics.underline, update_in_insert = true
update_in_insert = true
}) })
} }
} }
if O.lang.tsserver.autoformat then if O.lang.tsserver.autoformat then
require('lv-utils').define_augroups({ require('lv-utils').define_augroups({
_javascript_autoformat = { _javascript_autoformat = {
'BufWritePre', '*.js', 'lua vim.lsp.buf.formatting_sync(nil, 1000)' {
'BufWritePre', '*.js',
'lua vim.lsp.buf.formatting_sync(nil, 1000)'
}
}, },
_javascriptreact_autoformat = { _javascriptreact_autoformat = {
'BufWritePre', '*.jsx', 'lua vim.lsp.buf.formatting_sync(nil, 1000)' {
'BufWritePre', '*.jsx',
'lua vim.lsp.buf.formatting_sync(nil, 1000)'
}
}, },
_typescript_autoformat = { _typescript_autoformat = {
'BufWritePre', '*.ts', 'lua vim.lsp.buf.formatting_sync(nil, 1000)' {
'BufWritePre', '*.ts',
'lua vim.lsp.buf.formatting_sync(nil, 1000)'
}
}, },
_typescriptreact_autoformat = { _typescriptreact_autoformat = {
'BufWritePre', '*.tsx', 'lua vim.lsp.buf.formatting_sync(nil, 1000)' {
'BufWritePre', '*.tsx',
'lua vim.lsp.buf.formatting_sync(nil, 1000)'
}
} }
}) })
end end

6
lua/lsp/json-ls.lua
View file

@ -19,8 +19,10 @@ require'lspconfig'.jsonls.setup {
if O.lang.json.autoformat then if O.lang.json.autoformat then
require('lv-utils').define_augroups({ require('lv-utils').define_augroups({
_json_format = { _json_format = {
'BufWritePre', '*.json', {
'lua vim.lsp.buf.formatting_sync(nil, 1000)' 'BufWritePre', '*.json',
'lua vim.lsp.buf.formatting_sync(nil, 1000)'
}
} }
}) })
end end

17
lua/lsp/ruby-ls.lua
View file

@ -3,15 +3,14 @@ require'lspconfig'.solargraph.setup {
cmd = {DATA_PATH .. "/lspinstall/ruby/solargraph/solargraph", "--stdio"}, cmd = {DATA_PATH .. "/lspinstall/ruby/solargraph/solargraph", "--stdio"},
on_attach = require'lsp'.common_on_attach, on_attach = require'lsp'.common_on_attach,
handlers = { handlers = {
["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic ["textDocument/publishDiagnostics"] = vim.lsp.with(
.on_publish_diagnostics, vim.lsp.diagnostic.on_publish_diagnostics, {
{ virtual_text = O.lang.ruby.diagnostics.virtual_text,
virtual_text = O.lang.ruby.diagnostics.virtual_text, signs = O.lang.ruby.diagnostics.signs,
signs = O.lang.ruby.diagnostics.signs, underline = O.lang.ruby.diagnostics.underline,
underline = O.lang.ruby.diagnostics.underline, update_in_insert = true
update_in_insert = true
}) })
}, },
filetypes = O.lang.ruby.filetypes filetypes = O.lang.ruby.filetypes
} }
@ -19,7 +18,7 @@ require'lspconfig'.solargraph.setup {
if O.lang.ruby.autoformat then if O.lang.ruby.autoformat then
require('lv-utils').define_augroups({ require('lv-utils').define_augroups({
_ruby_format = { _ruby_format = {
'BufWritePre', '*.rb', 'lua vim.lsp.buf.formatting_sync(nil,1000)' {'BufWritePre', '*.rb', 'lua vim.lsp.buf.formatting_sync(nil,1000)'}
} }
}) })
end end

2
lua/lsp/rust-ls.lua
View file

@ -80,7 +80,7 @@ vim.api.nvim_exec([[
if O.lang.rust.autoformat then if O.lang.rust.autoformat then
require('lv-utils').define_augroups({ require('lv-utils').define_augroups({
_rust_format = { _rust_format = {
'BufWritePre', '*.rs', 'lua vim.lsp.buf.formatting_sync(nil,1000)' {'BufWritePre', '*.rs', 'lua vim.lsp.buf.formatting_sync(nil,1000)'}
} }
}) })
end end