summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.vim12
-rw-r--r--lua/treesitter-textobjects-setup.lua3
2 files changed, 5 insertions, 10 deletions
diff --git a/init.vim b/init.vim
index c53d899..7affbc5 100644
--- a/init.vim
+++ b/init.vim
@@ -45,7 +45,6 @@ Plug 'nvim-treesitter/nvim-treesitter-textobjects'
Plug 'stevearc/aerial.nvim'
Plug 'tpope/vim-surround'
-Plug 'lukas-reineke/indent-blankline.nvim'
Plug 'git://git.josher.dev/fieldmarshal.vim.git'
if has('rneovim')
@@ -160,7 +159,9 @@ if has('rneovim')
call HighlightColorColumns()
" This is my patched version of neovim.
if has('fancycolorcol')
- set colorcolumn=+1/│/MyColorColumn/b,+20/│/MyRedColorColumn/
+ " Grey color column right after text width is grey and in the background and
+ " a red one after the text width which is red and in the foreground.
+ set colorcolumn=+1/│/MyColorColumn/b,+20/│/MyRedColorColumn/f
else
hi! link ColorColumn MyColorColumn
set fillchars+=colorcol:│
@@ -177,7 +178,6 @@ command! TERM exec "term sh -c 'cd " . expand('%:p:h') . " && exec $SHELL'"
" W = w. I often click when typing :w
command! W w
-let g:indentLine_char = '┆'
lua << EOF
function remove_package(str)
@@ -214,12 +214,6 @@ lua << EOF
},
-- other configuration values here
})
- require("indent_blankline").setup {
- -- for example, context is off by default, use this to turn it on
- show_current_context = true,
- show_current_context_start = faels,
- char_highlight_list = { "MyColorColumn" }
- }
require('aerial').setup({
-- optionally use on_attach to set keymaps when aerial has attached to a buffer
diff --git a/lua/treesitter-textobjects-setup.lua b/lua/treesitter-textobjects-setup.lua
index bcb4bd9..1c5cf84 100644
--- a/lua/treesitter-textobjects-setup.lua
+++ b/lua/treesitter-textobjects-setup.lua
@@ -41,7 +41,8 @@ require'nvim-treesitter.configs'.setup {
-- * selection_mode: eg 'v'
-- and should return true of false
include_surrounding_whitespace = function (q)
- return string.match(q.query_string, '.inner$') == nil
+ return string.match(q.query_string, '.inner$') == nil and
+ string.match(q.query_string, '^function')
end,
},
},