From b6c42fa1be8957ab29f9268101398aef769414fc Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Sun, 8 May 2022 22:13:40 +0800 Subject: [PATCH] chore(bundle): update bundle indent-blankline.nvim --- bundle/README.md | 2 +- .../doc/indent_blankline.txt | 19 +++++++++++++++++-- .../lua/indent_blankline/init.lua | 5 +++-- .../lua/indent_blankline/utils.lua | 19 +++++++++---------- 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/bundle/README.md b/bundle/README.md index af4d83be5..4f653f1c8 100644 --- a/bundle/README.md +++ b/bundle/README.md @@ -17,7 +17,7 @@ In `bundle/` directory, there are two kinds of plugins: forked plugins without c - [defx.nvim](https://github.com/Shougo/defx.nvim/tree/df5e6ea6734dc002919ea41786668069fa0b497d) - [dein.vim](https://github.com/Shougo/dein.vim/tree/772ae08cef5e712b2b31b4aaee908fc853accd94) -- [indent-blankline.nvim](https://github.com/lukas-reineke/indent-blankline.nvim/tree/17a83ea765831cb0cc64f768b8c3f43479b90bbe) +- [indent-blankline.nvim](https://github.com/lukas-reineke/indent-blankline.nvim/tree/045d9582094b27f5ae04d8b635c6da8e97e53f1d) - [nvim-lspconfig](https://github.com/neovim/nvim-lspconfig/tree/507f8a570ac2b8b8dabdd0f62da3b3194bf822f8) - [deoplete-lsp](https://github.com/deoplete-plugins/deoplete-lsp/tree/c466c955e85d995984a8135e16da71463712e5e5) - [nvim-cmp](https://github.com/hrsh7th/nvim-cmp/tree/3192a0c57837c1ec5bf298e4f3ec984c7d2d60c0) diff --git a/bundle/indent-blankline.nvim/doc/indent_blankline.txt b/bundle/indent-blankline.nvim/doc/indent_blankline.txt index 8838df6fd..42f814107 100644 --- a/bundle/indent-blankline.nvim/doc/indent_blankline.txt +++ b/bundle/indent-blankline.nvim/doc/indent_blankline.txt @@ -2,7 +2,7 @@ Author: Lukas Reineke -Version: 2.15.0 +Version: 2.17.0 ============================================================================== CONTENTS *indent-blankline* @@ -389,6 +389,7 @@ g:indent_blankline_filetype_exclude *g:indent_blankline_filetype_exclude* "packer", ~ "checkhealth", ~ "help", ~ + "man", ~ "", ~ ] ~ @@ -404,7 +405,11 @@ g:indent_blankline_buftype_exclude *g:indent_blankline_buftype_exclude* Also set by |g:indentLine_bufTypeExclude| - Default: [] ~ + Default: [ ~ + "terminal", ~ + "nofile", ~ + "quickfix", ~ + ] ~ Example: > @@ -709,6 +714,16 @@ g:indent_blankline_debug *g:indent_blankline_debug* ============================================================================== 6. CHANGELOG *indent-blankline-changelog* +2.17.0 + Update defaults for |g:indent_blankline_buftype_exclude| + +2.16.0 + Add `man` to |g:indent_blankline_filetype_exclude| + Stylua update + +2.15.1 + Fix for nvim 0.5.1 + 2.15.0 * Add |g:indent_blankline_context_char_blankline| and |g:indent_blankline_context_char_list_blankline| options diff --git a/bundle/indent-blankline.nvim/lua/indent_blankline/init.lua b/bundle/indent-blankline.nvim/lua/indent_blankline/init.lua index 7a7819390..5234667fb 100644 --- a/bundle/indent-blankline.nvim/lua/indent_blankline/init.lua +++ b/bundle/indent-blankline.nvim/lua/indent_blankline/init.lua @@ -80,7 +80,7 @@ M.setup = function(options) options.filetype_exclude, vim.g.indent_blankline_filetype_exclude, vim.g.indentLine_fileTypeExclude, - { "lspinfo", "packer", "checkhealth", "help", "" } + { "lspinfo", "packer", "checkhealth", "help", "man", "" } ) vim.g.indent_blankline_bufname_exclude = o( options.bufname_exclude, @@ -90,7 +90,8 @@ M.setup = function(options) vim.g.indent_blankline_buftype_exclude = o( options.buftype_exclude, vim.g.indent_blankline_buftype_exclude, - vim.g.indentLine_bufTypeExclude + vim.g.indentLine_bufTypeExclude, + { "terminal", "nofile", "quickfix" } ) vim.g.indent_blankline_viewport_buffer = o(options.viewport_buffer, vim.g.indent_blankline_viewport_buffer, 10) vim.g.indent_blankline_use_treesitter = o(options.use_treesitter, vim.g.indent_blankline_use_treesitter, false) diff --git a/bundle/indent-blankline.nvim/lua/indent_blankline/utils.lua b/bundle/indent-blankline.nvim/lua/indent_blankline/utils.lua index db230b5d6..268f4c868 100644 --- a/bundle/indent-blankline.nvim/lua/indent_blankline/utils.lua +++ b/bundle/indent-blankline.nvim/lua/indent_blankline/utils.lua @@ -70,7 +70,8 @@ M.is_indent_blankline_enabled = M.memo( return false end - local undotted_filetypes = vim.split(filetype, ".", { plain = true }) + local plain = M._if(vim.fn.has "nvim-0.6.0" == 1, { plain = true }, true) + local undotted_filetypes = vim.split(filetype, ".", plain) table.insert(undotted_filetypes, filetype) for _, ft in ipairs(filetype_exclude) do @@ -214,15 +215,13 @@ M.reset_highlights = function() vim.fn.synIDattr(label_highlight, "fg", "cterm"), } - for highlight_name, highlight in - pairs { - IndentBlanklineChar = whitespace_fg, - IndentBlanklineSpaceChar = whitespace_fg, - IndentBlanklineSpaceCharBlankline = whitespace_fg, - IndentBlanklineContextChar = label_fg, - IndentBlanklineContextStart = label_fg, - } - do + for highlight_name, highlight in pairs { + IndentBlanklineChar = whitespace_fg, + IndentBlanklineSpaceChar = whitespace_fg, + IndentBlanklineSpaceCharBlankline = whitespace_fg, + IndentBlanklineContextChar = label_fg, + IndentBlanklineContextStart = label_fg, + } do local current_highlight = vim.fn.synIDtrans(vim.fn.hlID(highlight_name)) if vim.fn.synIDattr(current_highlight, "fg") == ""