Treesitter and better diff
Signed-off-by: Ryan <ryan@alien.gov>
This commit is contained in:
parent
6d0cbe06cc
commit
85f883864a
@ -15,6 +15,7 @@ o.scrolloff = 10
|
|||||||
o.showmode = false
|
o.showmode = false
|
||||||
o.termguicolors = true
|
o.termguicolors = true
|
||||||
o.title = true
|
o.title = true
|
||||||
|
vim.opt.diffopt = { "internal", "filler", "closeoff", "iwhite" }
|
||||||
|
|
||||||
-- controlling
|
-- controlling
|
||||||
global.mapleader = ' '
|
global.mapleader = ' '
|
||||||
@ -22,7 +23,7 @@ o.autoindent = true
|
|||||||
o.ignorecase = true
|
o.ignorecase = true
|
||||||
o.smartcase = true
|
o.smartcase = true
|
||||||
o.smartindent = true
|
o.smartindent = true
|
||||||
vim.opt.completeopt = { 'menu', 'menuone', 'noselect' }
|
vim.opt.completeopt = { 'menu', 'menuone', 'noselect', 'noinsert' }
|
||||||
|
|
||||||
-- vscode
|
-- vscode
|
||||||
if vim.g.vscode then
|
if vim.g.vscode then
|
||||||
|
@ -72,20 +72,13 @@ require("nvim-treesitter.configs").setup({
|
|||||||
goto_previous_start = {
|
goto_previous_start = {
|
||||||
["[m"] = "@function.outer",
|
["[m"] = "@function.outer",
|
||||||
["[["] = "@class.outer",
|
["[["] = "@class.outer",
|
||||||
|
["[o"] = "@loop.*",
|
||||||
|
["[z"] = { query = "@fold", query_group = "folds", desc = "Next fold" },
|
||||||
},
|
},
|
||||||
goto_previous_end = {
|
goto_previous_end = {
|
||||||
["[M"] = "@function.outer",
|
["[M"] = "@function.outer",
|
||||||
["[]"] = "@class.outer",
|
["[]"] = "@class.outer",
|
||||||
},
|
},
|
||||||
-- Below will go to either the start or the end, whichever is closer.
|
|
||||||
-- Use if you want more granular movements
|
|
||||||
-- Make it even more gradual by adding multiple queries and regex.
|
|
||||||
goto_next = {
|
|
||||||
["]d"] = "@conditional.outer",
|
|
||||||
},
|
|
||||||
goto_previous = {
|
|
||||||
["[d"] = "@conditional.outer",
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user