From 68562ea1beb691b03d848c3b7a348538f386efa5 Mon Sep 17 00:00:00 2001 From: Oliver Hartmann Date: Sat, 18 May 2024 20:19:57 +0200 Subject: [PATCH] some markdown enhancements --- after/syntax/markdown.lua | 2 +- lua/plugins/cmp.lua | 15 +++++++++++---- lua/plugins/lspconfig.lua | 15 ++++++++++----- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/after/syntax/markdown.lua b/after/syntax/markdown.lua index df6a488..73dac27 100644 --- a/after/syntax/markdown.lua +++ b/after/syntax/markdown.lua @@ -1 +1 @@ -vim.opt_local.conceallevel = 3 +vim.opt_local.conceallevel = 2 diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index 57cb476..31dc365 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -1,7 +1,7 @@ return { 'hrsh7th/nvim-cmp', branch = 'main', - event = {'InsertEnter', 'CmdlineEnter'}, + event = { 'InsertEnter', 'CmdlineEnter' }, dependencies = { { 'onsails/lspkind-nvim' }, { 'hrsh7th/cmp-buffer' }, @@ -89,9 +89,16 @@ return { end, }, sources = { - { name = 'neorg', priority = 8 }, - { name = 'luasnip', priority = 8 }, - { name = 'nvim_lsp', priority = 7 }, + { name = 'neorg', priority = 8 }, + { name = 'luasnip', priority = 8 }, + { + name = 'nvim_lsp', + option = { + markdown_oxide = { + keyword_pattern = [[\(\k\| \|\/\|#\)\+]] + } + } + }, { name = 'nvim_lsp_signature_help', priority = 7 }, -- { name = 'treesitter', priority = 6 }, { diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 3122278..70072f9 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -138,7 +138,12 @@ return { }) local lspconfig = require('lspconfig') - local capabilities = require('cmp_nvim_lsp').default_capabilities() + local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities()) + capabilities.workspace = { + didChangeWatchedFiles = { + dynamicRegistration = true, + }, + } local diagnostics = { Error = ' ', @@ -295,10 +300,10 @@ return { on_attach = on_attach, } - lspconfig['marksman'].setup { - capabilities = capabilities, - on_attach = on_attach, - } + -- lspconfig['marksman'].setup { + -- capabilities = capabilities, + -- on_attach = on_attach, + -- } lspconfig['yamlls'].setup { capabilities = capabilities,