Merge pull request 'add swift and cleanup lsp' (#32) from cleanup-lsp-add-swift into main
Reviewed-on: #32
This commit is contained in:
commit
b535afb6d9
1 changed files with 34 additions and 31 deletions
|
@ -16,11 +16,7 @@ return {
|
||||||
local lspconfig = require("lspconfig")
|
local lspconfig = require("lspconfig")
|
||||||
-- This function gets run when an LSP connects to a particular buffer.
|
-- This function gets run when an LSP connects to a particular buffer.
|
||||||
local on_attach = function(_, bufnr)
|
local on_attach = function(_, bufnr)
|
||||||
-- NOTE: Remember that lua is a real programming language, and as such it is possible
|
-- We create a function that lets us more easily define mappings specific
|
||||||
-- to define small helper and utility functions so you don't have to repeat yourself
|
|
||||||
-- many times.
|
|
||||||
--
|
|
||||||
-- In this case, we create a function that lets us more easily define mappings specific
|
|
||||||
-- for LSP related items. It sets the mode, buffer and description for us each time.
|
-- for LSP related items. It sets the mode, buffer and description for us each time.
|
||||||
local nmap = function(keys, func, desc)
|
local nmap = function(keys, func, desc)
|
||||||
if desc then
|
if desc then
|
||||||
|
@ -59,32 +55,6 @@ return {
|
||||||
end
|
end
|
||||||
|
|
||||||
local servers = {
|
local servers = {
|
||||||
bashls = {
|
|
||||||
bashIde = {
|
|
||||||
globPattern = "*@(.sh|.inc|.bash|.command)",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
lua_ls = {
|
|
||||||
Lua = {
|
|
||||||
diagnostics = { globals = { "vim" } },
|
|
||||||
workspace = { checkThirdParty = false },
|
|
||||||
telemetry = { enable = false },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
html = {},
|
|
||||||
jqls = {},
|
|
||||||
jsonls = {
|
|
||||||
json = {
|
|
||||||
format = {
|
|
||||||
enable = true,
|
|
||||||
},
|
|
||||||
schemas = require("schemastore").json.schemas(),
|
|
||||||
validate = true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
marksman = {},
|
|
||||||
nil_ls = {},
|
|
||||||
nixd = {},
|
|
||||||
basedpyright = {
|
basedpyright = {
|
||||||
analysis = {
|
analysis = {
|
||||||
autoImportCompletions = true,
|
autoImportCompletions = true,
|
||||||
|
@ -102,11 +72,44 @@ return {
|
||||||
useLibraryCodeForTypes = true,
|
useLibraryCodeForTypes = true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
bashls = {
|
||||||
|
bashIde = {
|
||||||
|
globPattern = "*@(.sh|.inc|.bash|.command)",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
html = {},
|
||||||
|
jqls = {},
|
||||||
|
jsonls = {
|
||||||
|
json = {
|
||||||
|
format = {
|
||||||
|
enable = true,
|
||||||
|
},
|
||||||
|
schemas = require("schemastore").json.schemas(),
|
||||||
|
validate = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
lua_ls = {
|
||||||
|
Lua = {
|
||||||
|
diagnostics = { globals = { "vim" } },
|
||||||
|
workspace = { checkThirdParty = false },
|
||||||
|
telemetry = { enable = false },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
marksman = {},
|
||||||
|
nil_ls = {},
|
||||||
|
nixd = {},
|
||||||
rust_analyzer = {
|
rust_analyzer = {
|
||||||
diagnostics = {
|
diagnostics = {
|
||||||
enable = true,
|
enable = true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
sourcekit = {
|
||||||
|
workspace = {
|
||||||
|
didChangeConfiguration = {
|
||||||
|
dynamicRegistration = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
ts_ls = {},
|
ts_ls = {},
|
||||||
yamlls = {},
|
yamlls = {},
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue