fixed tailwindcss autocomplete for htmldjango

This commit is contained in:
2022-08-26 00:07:17 -05:00
parent 0b1563d9c0
commit 2a886a393c
+200 -191
View File
@@ -19,59 +19,60 @@
local opt = vim.opt -- to set options local opt = vim.opt -- to set options
vim.diagnostic.config({ vim.diagnostic.config({
virtual_text = true, virtual_text = true,
signs = true, signs = true,
update_in_insert = false, update_in_insert = false,
}) })
local config = { local config = {
root_dir = require("lspconfig.util").root_pattern( root_dir = require("lspconfig.util").root_pattern(
"manage.py", "manage.py",
"pyproject.toml", "pyproject.toml",
"package.json", "package.json",
".null-ls-root", ".null-ls-root",
"Makefile", "Makefile",
".git" ".git"
), ),
on_attach = function(client, bufnr) on_attach = function(client, bufnr)
local function buf_set_keymap(...) local function buf_set_keymap(...)
vim.api.nvim_buf_set_keymap(bufnr, ...) vim.api.nvim_buf_set_keymap(bufnr, ...)
end end
local function buf_set_option(...)
vim.api.nvim_buf_set_option(bufnr, ...)
end
---- Disables document formatting by lsp local function buf_set_option(...)
--client.resolved_capabilities.document_formatting = false vim.api.nvim_buf_set_option(bufnr, ...)
--client.resolved_capabilities.document_range_formatting = false end
-- Enable completion triggered by <c-x><c-o> ---- Disables document formatting by lsp
buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc") --client.resolved_capabilities.document_formatting = false
--client.resolved_capabilities.document_range_formatting = false
-- Mappings. -- Enable completion triggered by <c-x><c-o>
local opts = { noremap = true, silent = true } buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")
-- See `:help vim.lsp.*` for documentation on any of the below functions -- Mappings.
buf_set_keymap("n", "<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts) local opts = { noremap = true, silent = true }
buf_set_keymap("n", "<space>D", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
buf_set_keymap("n", "<space>ca", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts) -- See `:help vim.lsp.*` for documentation on any of the below functions
buf_set_keymap("n", "<space>e", "<cmd>lua vim.diagnostic.open_float()<CR>", opts) buf_set_keymap("n", "<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.format({ async = true })<CR>", opts) buf_set_keymap("n", "<space>D", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
buf_set_keymap("n", "<space>q", "<cmd>lua vim.diagnostic.setloclist()<CR>", opts) buf_set_keymap("n", "<space>ca", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts)
buf_set_keymap("n", "<space>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opts) buf_set_keymap("n", "<space>e", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)
buf_set_keymap("n", "<space>wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", opts) buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.format({ async = true })<CR>", opts)
buf_set_keymap("n", "<space>wl", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>", opts) buf_set_keymap("n", "<space>q", "<cmd>lua vim.diagnostic.setloclist()<CR>", opts)
buf_set_keymap("n", "<space>wr", "<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>", opts) buf_set_keymap("n", "<space>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
buf_set_keymap("n", "K", "<cmd>lua vim.lsp.buf.hover()<CR>", opts) buf_set_keymap("n", "<space>wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", opts)
buf_set_keymap("n", "[d", "<cmd>lua vim.diagnostic.goto_prev({wrap = true})<CR>", opts) buf_set_keymap("n", "<space>wl", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>", opts)
buf_set_keymap("n", "]d", "<cmd>lua vim.diagnostic.goto_next({wrap = true})<CR>", opts) buf_set_keymap("n", "<space>wr", "<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>", opts)
buf_set_keymap("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opts) buf_set_keymap("n", "K", "<cmd>lua vim.lsp.buf.hover()<CR>", opts)
buf_set_keymap("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", opts) buf_set_keymap("n", "[d", "<cmd>lua vim.diagnostic.goto_prev({wrap = true})<CR>", opts)
buf_set_keymap("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts) buf_set_keymap("n", "]d", "<cmd>lua vim.diagnostic.goto_next({wrap = true})<CR>", opts)
buf_set_keymap("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts) buf_set_keymap("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opts)
end, buf_set_keymap("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", opts)
buf_set_keymap("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
buf_set_keymap("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
end,
} }
-- .oooooo. ooo ooooo ooooooooo. -- .oooooo. ooo ooooo ooooooooo.
@@ -93,38 +94,38 @@ local cmp = require("cmp")
-- CMP NVIM ULTISNIP -- CMP NVIM ULTISNIP
local cmp_ultisnips_mappings = require("cmp_nvim_ultisnips.mappings") local cmp_ultisnips_mappings = require("cmp_nvim_ultisnips.mappings")
local ultisnip = { local ultisnip = {
expand = function(args) expand = function(args)
vim.fn["UltiSnips#Anon"](args.body) vim.fn["UltiSnips#Anon"](args.body)
end, end,
tab = cmp.mapping(function(fallback) tab = cmp.mapping(function(fallback)
cmp_ultisnips_mappings.compose({ "select_next_item" })(fallback) cmp_ultisnips_mappings.compose({ "select_next_item" })(fallback)
end, { "i", "s" }), end, { "i", "s" }),
shift_tab = cmp.mapping(function(fallback) shift_tab = cmp.mapping(function(fallback)
cmp_ultisnips_mappings.compose({ "select_prev_item" })(fallback) cmp_ultisnips_mappings.compose({ "select_prev_item" })(fallback)
end, { "i", "s" }), end, { "i", "s" }),
} }
cmp.setup({ cmp.setup({
snippet = { snippet = {
expand = ultisnip.expand, expand = ultisnip.expand,
}, },
mapping = { mapping = {
["<C-p>"] = cmp.mapping.select_prev_item(), ["<C-p>"] = cmp.mapping.select_prev_item(),
["<C-n>"] = cmp.mapping.select_next_item(), ["<C-n>"] = cmp.mapping.select_next_item(),
["<C-d>"] = cmp.mapping.scroll_docs(-4), ["<C-d>"] = cmp.mapping.scroll_docs(-4),
["<C-f>"] = cmp.mapping.scroll_docs(4), ["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(), ["<C-Space>"] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.close(), ["<C-e>"] = cmp.mapping.close(),
["<CR>"] = cmp.mapping.confirm({ ["<CR>"] = cmp.mapping.confirm({
select = true, select = true,
}), }),
["<Tab>"] = ultisnip.tab, ["<Tab>"] = ultisnip.tab,
["<S-Tab>"] = ultisnip.shift_tab, ["<S-Tab>"] = ultisnip.shift_tab,
}, },
sources = { sources = {
{ name = "nvim_lsp" }, { name = "nvim_lsp" },
{ name = "ultisnips" }, { name = "ultisnips" },
}, },
}) })
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({ map_char = { tex = "" } })) cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({ map_char = { tex = "" } }))
@@ -141,44 +142,44 @@ local null_ls = require("null-ls")
-- ORDER IN TABLE DETERMINES EXECUTION ORDER -- ORDER IN TABLE DETERMINES EXECUTION ORDER
local sources = { local sources = {
-- python -- python
null_ls.builtins.diagnostics.flake8, null_ls.builtins.diagnostics.flake8,
null_ls.builtins.diagnostics.mypy, null_ls.builtins.diagnostics.mypy,
null_ls.builtins.formatting.black, null_ls.builtins.formatting.black,
null_ls.builtins.formatting.isort, null_ls.builtins.formatting.isort,
-- js -- js
null_ls.builtins.diagnostics.eslint, null_ls.builtins.diagnostics.eslint,
null_ls.builtins.code_actions.eslint, null_ls.builtins.code_actions.eslint,
null_ls.builtins.formatting.prettier.with({ null_ls.builtins.formatting.prettier.with({
extra_filetypes = { "svelte" }, extra_filetypes = { "svelte" },
}), }),
-- lua -- lua
null_ls.builtins.formatting.stylua, null_ls.builtins.formatting.stylua,
-- bash -- bash
null_ls.builtins.formatting.shfmt, null_ls.builtins.formatting.shfmt,
null_ls.builtins.diagnostics.shellcheck, null_ls.builtins.diagnostics.shellcheck,
null_ls.builtins.code_actions.shellcheck, null_ls.builtins.code_actions.shellcheck,
-- cpp -- cpp
null_ls.builtins.formatting.clang_format, null_ls.builtins.formatting.clang_format,
-- latex -- latex
null_ls.builtins.formatting.latexindent, null_ls.builtins.formatting.latexindent,
null_ls.builtins.diagnostics.chktex, null_ls.builtins.diagnostics.chktex,
-- golang -- golang
null_ls.builtins.diagnostics.golangci_lint, null_ls.builtins.diagnostics.golangci_lint,
-- sql -- sql
--null_ls.builtins.diagnostics.sqlfluff.with({ --null_ls.builtins.diagnostics.sqlfluff.with({
-- --filetypes = { "sql", "html" }, -- --filetypes = { "sql", "html" },
-- args = { "lint", "--dialect", "ansi", "-f", "github-annotation", "-n", "--disable_progress_bar", "-" }, -- args = { "lint", "--dialect", "ansi", "-f", "github-annotation", "-n", "--disable_progress_bar", "-" },
--}), --}),
--null_ls.builtins.formatting.sqlfluff.with({ --null_ls.builtins.formatting.sqlfluff.with({
-- --filetypes = { "sql", "html" }, -- --filetypes = { "sql", "html" },
-- args = { "fix", "--dialect", "ansi", "--disable_progress_bar", "-f", "-n", "-" }, -- args = { "fix", "--dialect", "ansi", "--disable_progress_bar", "-f", "-n", "-" },
--}), --}),
} }
null_ls.setup({ null_ls.setup({
sources = sources, sources = sources,
on_attach = config.on_attach, on_attach = config.on_attach,
root_dir = config.root_dir, root_dir = config.root_dir,
}) })
-- ooooo .oooooo..o ooooooooo. ooooo . oooo oooo -- ooooo .oooooo..o ooooooooo. ooooo . oooo oooo
@@ -190,103 +191,111 @@ null_ls.setup({
-- o888ooooood8 8""88888P' o888o o888o o888o o888o 8""888P' "888" `Y888""8o o888o o888o `Y8bod8P' d888b -- o888ooooood8 8""88888P' o888o o888o o888o o888o 8""888P' "888" `Y888""8o o888o o888o `Y8bod8P' d888b
local on_attach_tsserver = function(client, bufnr) local on_attach_tsserver = function(client, bufnr)
local ts_utils = require("nvim-lsp-ts-utils") local ts_utils = require("nvim-lsp-ts-utils")
ts_utils.setup({ ts_utils.setup({
eslint_bin = "eslint_d", eslint_bin = "eslint_d",
eslint_enable_diagnostics = true, eslint_enable_diagnostics = true,
eslint_enable_code_actions = true, eslint_enable_code_actions = true,
enable_import_on_completion = true, enable_import_on_completion = true,
filter_out_diagnostics_by_severity = { filter_out_diagnostics_by_severity = {
"information", "information",
"hint", "hint",
--"warning", --"warning",
--"error", --"error",
}, },
}) })
ts_utils.setup_client(client) ts_utils.setup_client(client)
-- no default maps, so you may want to define some here -- no default maps, so you may want to define some here
local o = { silent = true } local o = { silent = true }
vim.api.nvim_buf_set_keymap(bufnr, "n", "gs", ":TSLspOrganize<CR>", o) vim.api.nvim_buf_set_keymap(bufnr, "n", "gs", ":TSLspOrganize<CR>", o)
vim.api.nvim_buf_set_keymap(bufnr, "n", "rN", ":TSLspRenameFile<CR>", o) vim.api.nvim_buf_set_keymap(bufnr, "n", "rN", ":TSLspRenameFile<CR>", o)
vim.api.nvim_buf_set_keymap(bufnr, "n", "gI", ":TSLspImportAll<CR>", o) vim.api.nvim_buf_set_keymap(bufnr, "n", "gI", ":TSLspImportAll<CR>", o)
end end
require("nvim-lsp-installer").on_server_ready(function(server) require("nvim-lsp-installer").on_server_ready(function(server)
--Enable (broadcasting) snippet capability for completion --Enable (broadcasting) snippet capability for completion
local capabilities = vim.lsp.protocol.make_client_capabilities() local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true capabilities.textDocument.completion.completionItem.snippetSupport = true
local disable_diag = { local disable_diag = {
["textDocument/publishDiagnostics"] = function() end, ["textDocument/publishDiagnostics"] = function() end,
} }
local on_attach_generic = function(client, bufnr) local on_attach_generic = function(client, bufnr)
-- Disables document formatting by lsp -- Disables document formatting by lsp
client.server_capabilities.document_formatting = false client.server_capabilities.document_formatting = false
client.server_capabilities.document_range_formatting = false client.server_capabilities.document_range_formatting = false
config.on_attach(client, bufnr) config.on_attach(client, bufnr)
end end
local opts = { local opts = {
on_attach = on_attach_generic, on_attach = on_attach_generic,
capabilities = capabilities, capabilities = capabilities,
flags = { flags = {
debounce_text_changes = 150, debounce_text_changes = 150,
}, },
settings = { settings = {
format = { enable = true }, format = { enable = true },
}, },
root_dir = config.root_dir, root_dir = config.root_dir,
} }
if server.name == "tsserver" then if server.name == "tsserver" then
opts.on_attach = function(...) opts.on_attach = function(...)
on_attach_tsserver(...) on_attach_tsserver(...)
on_attach_generic(...) on_attach_generic(...)
end end
elseif server.name == "sumneko_lua" then elseif server.name == "sumneko_lua" then
opts.settings.Lua = { opts.settings.Lua = {
diagnostics = { diagnostics = {
globals = { globals = {
"vim", "vim",
"awesome", "awesome",
"client", "client",
}, },
}, },
} }
end elseif server.name == "html" then
opts.filetypes = { "html", "htmldjango" }
elseif server.name == "tailwindcss" then
opts.init_options = {
userLanguages = {
htmldjango = "html",
},
}
end
server:setup(opts) server:setup(opts)
vim.cmd([[do User LspAttachBuffers]]) vim.cmd([[do User LspAttachBuffers]])
end) end)
local lsp_installer_servers = require("nvim-lsp-installer.servers") local lsp_installer_servers = require("nvim-lsp-installer.servers")
local auto_servers = { local auto_servers = {
--"pylsp", --"pylsp",
--"pyright", --"pyright",
"sumneko_lua", "sumneko_lua",
"tsserver", "tsserver",
"bashls", "bashls",
"vimls", "vimls",
"rust_analyzer", "rust_analyzer",
"html", "html",
"cssls", "cssls",
"jsonls", "jsonls",
--"omnisharp", --"omnisharp",
"ltex", "ltex",
"jedi_language_server", "jedi_language_server",
"vuels", "vuels",
"svelte", "svelte",
"gopls", "gopls",
"golangci_lint_ls", "golangci_lint_ls",
"tailwindcss", "tailwindcss",
} }
for _, s in ipairs(auto_servers) do for _, s in ipairs(auto_servers) do
local ok, server = lsp_installer_servers.get_server(s) local ok, server = lsp_installer_servers.get_server(s)
if ok and not server:is_installed() then if ok and not server:is_installed() then
server:install() server:install()
end end
end end