summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkylo252 <[email protected]>2022-05-11 17:15:00 +0200
committerGitHub <[email protected]>2022-05-11 17:15:00 +0200
commita2714c3c382a1b6c9d4390eead924cc48ac594a3 (patch)
treebe93060f5f79c4172eac06fd4810675920835eb1
parentb0608275189f6adf389053e4a19447732eae08dd (diff)
fix(autocmds): disable commentstring_calc on cursor-hold (#2581)
-rw-r--r--lua/lvim/core/treesitter.lua7
-rw-r--r--lua/lvim/lsp/utils.lua2
2 files changed, 4 insertions, 5 deletions
diff --git a/lua/lvim/core/treesitter.lua b/lua/lvim/core/treesitter.lua
index d8b0c136..fcada24f 100644
--- a/lua/lvim/core/treesitter.lua
+++ b/lua/lvim/core/treesitter.lua
@@ -12,11 +12,12 @@ M.config = function()
},
highlight = {
enable = true, -- false will disable the whole extension
- additional_vim_regex_highlighting = true,
+ additional_vim_regex_highlighting = false,
disable = { "latex" },
},
context_commentstring = {
enable = true,
+ enable_autocmd = false,
config = {
-- Languages that have a single comment style
typescript = "// %s",
@@ -28,9 +29,7 @@ M.config = function()
json = "",
},
},
- -- indent = {enable = true, disable = {"python", "html", "javascript"}},
- -- TODO seems to be broken
- indent = { enable = true, disable = { "yaml" } },
+ indent = { enable = true, disable = { "yaml", "python" } },
autotag = { enable = false },
textobjects = {
swap = {
diff --git a/lua/lvim/lsp/utils.lua b/lua/lvim/lsp/utils.lua
index cf9db68f..252e611c 100644
--- a/lua/lvim/lsp/utils.lua
+++ b/lua/lvim/lsp/utils.lua
@@ -153,7 +153,7 @@ function M.format(opts)
opts = opts or { filter = M.format_filter }
if vim.lsp.buf.format then
- vim.lsp.buf.format(opts)
+ return vim.lsp.buf.format(opts)
end
local bufnr = opts.bufnr or vim.api.nvim_get_current_buf()