Skip to content

Commit

Permalink
Revert "Remove nvim-ufo"
Browse files Browse the repository at this point in the history
This reverts commit a3bbf8d.
  • Loading branch information
phelipetls committed Oct 26, 2023
1 parent d2c0b30 commit 9355a0c
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 6 deletions.
13 changes: 13 additions & 0 deletions .config/nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,19 @@ vim.g.dirvish_mode = [[:sort ,^.*[\/],]]
vim.cmd("packadd! fzf-lua")
require("plugins.config.fzf_lua")

-- folding
vim.cmd("packadd! promise-async")
vim.cmd("packadd! nvim-ufo")
require("ufo").setup({
provider_selector = function(_, filetype)
if filetype == "gitcommit" then
return ""
end
end,
})
vim.keymap.set("n", "zR", require("ufo").openAllFolds)
vim.keymap.set("n", "zM", require("ufo").closeAllFolds)

-- lsp
require("plugins.config.lsp")

Expand Down
21 changes: 15 additions & 6 deletions .config/nvim/lua/plugins/config/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@ local lspconfig = require("lspconfig")

local cmp_capabilities = require("cmp_nvim_lsp").default_capabilities()

local fold_capabilities = {
textDocument = {
foldingRange = {
dynamicRegistration = false,
lineFoldingOnly = true,
},
},
}

local function organize_imports()
local params = {
command = "_typescript.organizeImports",
Expand All @@ -79,7 +88,6 @@ local function organize_imports()
end

lspconfig.tsserver.setup({
capabilities = vim.tbl_extend("force", {}, cmp_capabilities),
on_attach = function(_, bufnr)
vim.keymap.set("n", "<M-S-O>", "<cmd>OrganizeImports<CR>", {
buffer = bufnr,
Expand All @@ -91,30 +99,31 @@ lspconfig.tsserver.setup({
description = "Organize imports",
},
},
capabilities = vim.tbl_extend("force", cmp_capabilities, fold_capabilities),
})

lspconfig.astro.setup({
capabilities = vim.tbl_extend("force", {}, cmp_capabilities),
capabilities = vim.tbl_extend("force", cmp_capabilities, fold_capabilities),
})

lspconfig.html.setup({
capabilities = vim.tbl_extend("force", {}, cmp_capabilities),
capabilities = vim.tbl_extend("force", cmp_capabilities, fold_capabilities),
})

lspconfig.cssls.setup({
capabilities = vim.tbl_extend("force", {}, cmp_capabilities),
capabilities = vim.tbl_extend("force", cmp_capabilities, fold_capabilities),
})

lspconfig.jsonls.setup({
capabilities = vim.tbl_extend("force", {}, cmp_capabilities),
capabilities = vim.tbl_extend("force", cmp_capabilities, fold_capabilities),
})

lspconfig.tailwindcss.setup({
capabilities = cmp_capabilities,
})

lspconfig.lua_ls.setup({
capabilities = vim.tbl_extend("force", {}, cmp_capabilities),
capabilities = vim.tbl_extend("force", cmp_capabilities, fold_capabilities),
on_init = function(client)
client.config.settings = vim.tbl_deep_extend("force", client.config.settings, {
Lua = {
Expand Down
1 change: 1 addition & 0 deletions .config/nvim/pack/plugins/opt/promise-async
Submodule promise-async added at e94f35
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@
path = .config/nvim/pack/plugins/opt/nvim-ufo
url = https://github.com/kevinhwang91/nvim-ufo
ignore = dirty
[submodule "promise-async"]
path = .config/nvim/pack/plugins/opt/promise-async
url = https://github.com/kevinhwang91/promise-async
ignore = dirty
[submodule "statuscol.nvim"]
path = .config/nvim/pack/plugins/opt/statuscol.nvim
url = https://github.com/luukvbaal/statuscol.nvim
Expand Down

0 comments on commit 9355a0c

Please sign in to comment.