style: indenting
This commit is contained in:
@@ -1,59 +1,61 @@
|
||||
return {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
build = ":TSUpdate",
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
-- event = { "BufReadPre", "BufNewFile" },
|
||||
lazy = true,
|
||||
cmd = { 'TSUpdateSync', 'TSUpdate', 'TSInstall' },
|
||||
build = ':TSUpdate',
|
||||
dependencies = {
|
||||
"windwp/nvim-ts-autotag",
|
||||
'windwp/nvim-ts-autotag',
|
||||
},
|
||||
opts = {
|
||||
highlight = {
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
indent = { enable = true, disable = {} },
|
||||
autotag = { enable = true },
|
||||
ensure_installed = {
|
||||
'bash',
|
||||
'css',
|
||||
'diff',
|
||||
'dockerfile',
|
||||
'git_config',
|
||||
'git_rebase',
|
||||
'gitcommit',
|
||||
'gitignore',
|
||||
'graphql',
|
||||
'html',
|
||||
'javascript',
|
||||
'json',
|
||||
'lua',
|
||||
'markdown',
|
||||
'markdown_inline',
|
||||
'python',
|
||||
'regex',
|
||||
'sql',
|
||||
'todotxt',
|
||||
'vim',
|
||||
'vimdoc',
|
||||
'xml',
|
||||
'tmux',
|
||||
'toml',
|
||||
'yaml',
|
||||
},
|
||||
ignore_install = {},
|
||||
sync_install = true,
|
||||
auto_install = true,
|
||||
incremental_selection = {
|
||||
enable = true,
|
||||
keymaps = {
|
||||
init_selection = '<C-space>',
|
||||
node_incremental = '<C-space>',
|
||||
scope_incremental = false,
|
||||
node_decremental = '<bs>',
|
||||
},
|
||||
},
|
||||
},
|
||||
config = function()
|
||||
local treesitter = require "nvim-treesitter.configs"
|
||||
|
||||
treesitter.setup {
|
||||
highlight = {
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = true,
|
||||
},
|
||||
indent = { enable = true },
|
||||
autotag = { enable = true },
|
||||
ensure_installed = {
|
||||
"bash",
|
||||
"css",
|
||||
"diff",
|
||||
"dockerfile",
|
||||
"git_config",
|
||||
"git_rebase",
|
||||
"gitcommit",
|
||||
"gitignore",
|
||||
"graphql",
|
||||
"html",
|
||||
"javascript",
|
||||
"json",
|
||||
"lua",
|
||||
"markdown",
|
||||
"markdown_inline",
|
||||
"python",
|
||||
"regex",
|
||||
"sql",
|
||||
"todotxt",
|
||||
"vim",
|
||||
"vimdoc",
|
||||
"xml",
|
||||
"tmux",
|
||||
"toml",
|
||||
"yaml",
|
||||
},
|
||||
ignore_install = {},
|
||||
sync_install = true,
|
||||
auto_install = true,
|
||||
incremental_selection = {
|
||||
enable = true,
|
||||
keymaps = {
|
||||
init_selection = "<C-space>",
|
||||
node_incremental = "<C-space>",
|
||||
scope_incremental = false,
|
||||
node_decremental = "<bs>",
|
||||
},
|
||||
},
|
||||
}
|
||||
config = function(_, opts)
|
||||
require('nvim-treesitter.configs').setup(opts)
|
||||
end,
|
||||
}
|
||||
@@ -1,114 +1,114 @@
|
||||
return {
|
||||
'nvim-treesitter/nvim-treesitter-textobjects',
|
||||
dependencies = {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
},
|
||||
event = { 'BufReadPost', 'BufWritePost', 'BufNewFile', 'VeryLazy' },
|
||||
'nvim-treesitter/nvim-treesitter-textobjects',
|
||||
dependencies = {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
},
|
||||
event = { 'BufReadPost', 'BufWritePost', 'BufNewFile', 'VeryLazy' },
|
||||
|
||||
opts = {
|
||||
textobjects = {
|
||||
select = {
|
||||
enable = true,
|
||||
-- Automatically jump forward to textobj, similar to targets.vim
|
||||
lookahead = true,
|
||||
keymaps = {
|
||||
-- You can use the capture groups defined in textobjects.scm
|
||||
['a='] = { query = '@assignment.outer', desc = 'Select outer part of an assignment' },
|
||||
['i='] = { query = '@assignment.inner', desc = 'Select inner part of an assignment' },
|
||||
['l='] = { query = '@assignment.lhs', desc = 'Select left hand side of an assignment' },
|
||||
['r='] = { query = '@assignment.rhs', desc = 'Select right hand side of an assignment' },
|
||||
opts = {
|
||||
textobjects = {
|
||||
select = {
|
||||
enable = true,
|
||||
-- Automatically jump forward to textobj, similar to targets.vim
|
||||
lookahead = true,
|
||||
keymaps = {
|
||||
-- You can use the capture groups defined in textobjects.scm
|
||||
['a='] = { query = '@assignment.outer', desc = 'Select outer part of an assignment' },
|
||||
['i='] = { query = '@assignment.inner', desc = 'Select inner part of an assignment' },
|
||||
['l='] = { query = '@assignment.lhs', desc = 'Select left hand side of an assignment' },
|
||||
['r='] = { query = '@assignment.rhs', desc = 'Select right hand side of an assignment' },
|
||||
|
||||
-- works for javascript/typescript files (custom capture I created in after/queries/ecma/textobjects.scm)
|
||||
['a:'] = { query = '@property.outer', desc = 'Select outer part of an object property' },
|
||||
['i:'] = { query = '@property.inner', desc = 'Select inner part of an object property' },
|
||||
['l:'] = { query = '@property.lhs', desc = 'Select left part of an object property' },
|
||||
['r:'] = { query = '@property.rhs', desc = 'Select right part of an object property' },
|
||||
-- works for javascript/typescript files (custom capture I created in after/queries/ecma/textobjects.scm)
|
||||
['a:'] = { query = '@property.outer', desc = 'Select outer part of an object property' },
|
||||
['i:'] = { query = '@property.inner', desc = 'Select inner part of an object property' },
|
||||
['l:'] = { query = '@property.lhs', desc = 'Select left part of an object property' },
|
||||
['r:'] = { query = '@property.rhs', desc = 'Select right part of an object property' },
|
||||
|
||||
['aa'] = { query = '@parameter.outer', desc = 'Select outer part of a parameter/argument' },
|
||||
['ia'] = { query = '@parameter.inner', desc = 'Select inner part of a parameter/argument' },
|
||||
['aa'] = { query = '@parameter.outer', desc = 'Select outer part of a parameter/argument' },
|
||||
['ia'] = { query = '@parameter.inner', desc = 'Select inner part of a parameter/argument' },
|
||||
|
||||
['ai'] = { query = '@conditional.outer', desc = 'Select outer part of a conditional' },
|
||||
['ii'] = { query = '@conditional.inner', desc = 'Select inner part of a conditional' },
|
||||
['ai'] = { query = '@conditional.outer', desc = 'Select outer part of a conditional' },
|
||||
['ii'] = { query = '@conditional.inner', desc = 'Select inner part of a conditional' },
|
||||
|
||||
['al'] = { query = '@loop.outer', desc = 'Select outer part of a loop' },
|
||||
['il'] = { query = '@loop.inner', desc = 'Select inner part of a loop' },
|
||||
['al'] = { query = '@loop.outer', desc = 'Select outer part of a loop' },
|
||||
['il'] = { query = '@loop.inner', desc = 'Select inner part of a loop' },
|
||||
|
||||
['af'] = { query = '@call.outer', desc = 'Select outer part of a function call' },
|
||||
['if'] = { query = '@call.inner', desc = 'Select inner part of a function call' },
|
||||
['af'] = { query = '@call.outer', desc = 'Select outer part of a function call' },
|
||||
['if'] = { query = '@call.inner', desc = 'Select inner part of a function call' },
|
||||
|
||||
['am'] = { query = '@function.outer', desc = 'Select outer part of a method/function definition' },
|
||||
['im'] = { query = '@function.inner', desc = 'Select inner part of a method/function definition' },
|
||||
['am'] = { query = '@function.outer', desc = 'Select outer part of a method/function definition' },
|
||||
['im'] = { query = '@function.inner', desc = 'Select inner part of a method/function definition' },
|
||||
|
||||
['ac'] = { query = '@class.outer', desc = 'Select outer part of a class' },
|
||||
['ic'] = { query = '@class.inner', desc = 'Select inner part of a class' },
|
||||
},
|
||||
['ac'] = { query = '@class.outer', desc = 'Select outer part of a class' },
|
||||
['ic'] = { query = '@class.inner', desc = 'Select inner part of a class' },
|
||||
},
|
||||
},
|
||||
swap = {
|
||||
enable = true,
|
||||
swap_next = {
|
||||
['<leader>na'] = '@parameter.inner', -- swap parameters/argument with next
|
||||
['<leader>n:'] = '@property.outer', -- swap object property with next
|
||||
['<leader>nm'] = '@function.outer', -- swap function with next
|
||||
},
|
||||
swap_previous = {
|
||||
['<leader>pa'] = '@parameter.inner', -- swap parameters/argument with prev
|
||||
['<leader>p:'] = '@property.outer', -- swap object property with prev
|
||||
['<leader>pm'] = '@function.outer', -- swap function with previous
|
||||
},
|
||||
},
|
||||
move = {
|
||||
enable = true,
|
||||
set_jumps = true, -- whether to set jumps in the jumplist
|
||||
goto_next_start = {
|
||||
[']f'] = { query = '@call.outer', desc = 'Next function call start' },
|
||||
[']m'] = { query = '@function.outer', desc = 'Next method/function def start' },
|
||||
[']c'] = { query = '@class.outer', desc = 'Next class start' },
|
||||
[']i'] = { query = '@conditional.outer', desc = 'Next conditional start' },
|
||||
[']l'] = { query = '@loop.outer', desc = 'Next loop start' },
|
||||
|
||||
-- You can pass a query group to use query from `queries/<lang>/<query_group>.scm file in your runtime path.
|
||||
-- Below example nvim-treesitter's `locals.scm` and `folds.scm`. They also provide highlights.scm and indent.scm.
|
||||
[']s'] = { query = '@scope', query_group = 'locals', desc = 'Next scope' },
|
||||
[']z'] = { query = '@fold', query_group = 'folds', desc = 'Next fold' },
|
||||
},
|
||||
goto_next_end = {
|
||||
[']F'] = { query = '@call.outer', desc = 'Next function call end' },
|
||||
[']M'] = { query = '@function.outer', desc = 'Next method/function def end' },
|
||||
[']C'] = { query = '@class.outer', desc = 'Next class end' },
|
||||
[']I'] = { query = '@conditional.outer', desc = 'Next conditional end' },
|
||||
[']L'] = { query = '@loop.outer', desc = 'Next loop end' },
|
||||
},
|
||||
goto_previous_start = {
|
||||
['[f'] = { query = '@call.outer', desc = 'Prev function call start' },
|
||||
['[m'] = { query = '@function.outer', desc = 'Prev method/function def start' },
|
||||
['[c'] = { query = '@class.outer', desc = 'Prev class start' },
|
||||
['[i'] = { query = '@conditional.outer', desc = 'Prev conditional start' },
|
||||
['[l'] = { query = '@loop.outer', desc = 'Prev loop start' },
|
||||
},
|
||||
goto_previous_end = {
|
||||
['[F'] = { query = '@call.outer', desc = 'Prev function call end' },
|
||||
['[M'] = { query = '@function.outer', desc = 'Prev method/function def end' },
|
||||
['[C'] = { query = '@class.outer', desc = 'Prev class end' },
|
||||
['[I'] = { query = '@conditional.outer', desc = 'Prev conditional end' },
|
||||
['[L'] = { query = '@loop.outer', desc = 'Prev loop end' },
|
||||
},
|
||||
},
|
||||
},
|
||||
swap = {
|
||||
enable = true,
|
||||
swap_next = {
|
||||
['<leader>na'] = '@parameter.inner', -- swap parameters/argument with next
|
||||
['<leader>n:'] = '@property.outer', -- swap object property with next
|
||||
['<leader>nm'] = '@function.outer', -- swap function with next
|
||||
},
|
||||
swap_previous = {
|
||||
['<leader>pa'] = '@parameter.inner', -- swap parameters/argument with prev
|
||||
['<leader>p:'] = '@property.outer', -- swap object property with prev
|
||||
['<leader>pm'] = '@function.outer', -- swap function with previous
|
||||
},
|
||||
},
|
||||
move = {
|
||||
enable = true,
|
||||
set_jumps = true, -- whether to set jumps in the jumplist
|
||||
goto_next_start = {
|
||||
[']f'] = { query = '@call.outer', desc = 'Next function call start' },
|
||||
[']m'] = { query = '@function.outer', desc = 'Next method/function def start' },
|
||||
[']c'] = { query = '@class.outer', desc = 'Next class start' },
|
||||
[']i'] = { query = '@conditional.outer', desc = 'Next conditional start' },
|
||||
[']l'] = { query = '@loop.outer', desc = 'Next loop start' },
|
||||
},
|
||||
|
||||
-- You can pass a query group to use query from `queries/<lang>/<query_group>.scm file in your runtime path.
|
||||
-- Below example nvim-treesitter's `locals.scm` and `folds.scm`. They also provide highlights.scm and indent.scm.
|
||||
[']s'] = { query = '@scope', query_group = 'locals', desc = 'Next scope' },
|
||||
[']z'] = { query = '@fold', query_group = 'folds', desc = 'Next fold' },
|
||||
},
|
||||
goto_next_end = {
|
||||
[']F'] = { query = '@call.outer', desc = 'Next function call end' },
|
||||
[']M'] = { query = '@function.outer', desc = 'Next method/function def end' },
|
||||
[']C'] = { query = '@class.outer', desc = 'Next class end' },
|
||||
[']I'] = { query = '@conditional.outer', desc = 'Next conditional end' },
|
||||
[']L'] = { query = '@loop.outer', desc = 'Next loop end' },
|
||||
},
|
||||
goto_previous_start = {
|
||||
['[f'] = { query = '@call.outer', desc = 'Prev function call start' },
|
||||
['[m'] = { query = '@function.outer', desc = 'Prev method/function def start' },
|
||||
['[c'] = { query = '@class.outer', desc = 'Prev class start' },
|
||||
['[i'] = { query = '@conditional.outer', desc = 'Prev conditional start' },
|
||||
['[l'] = { query = '@loop.outer', desc = 'Prev loop start' },
|
||||
},
|
||||
goto_previous_end = {
|
||||
['[F'] = { query = '@call.outer', desc = 'Prev function call end' },
|
||||
['[M'] = { query = '@function.outer', desc = 'Prev method/function def end' },
|
||||
['[C'] = { query = '@class.outer', desc = 'Prev class end' },
|
||||
['[I'] = { query = '@conditional.outer', desc = 'Prev conditional end' },
|
||||
['[L'] = { query = '@loop.outer', desc = 'Prev loop end' },
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
config = function(_, opts)
|
||||
require('nvim-treesitter.configs').setup(opts)
|
||||
|
||||
config = function(_, opts)
|
||||
require('nvim-treesitter.configs').setup(opts)
|
||||
local ts_repeat_move = require('nvim-treesitter.textobjects.repeatable_move')
|
||||
|
||||
local ts_repeat_move = require('nvim-treesitter.textobjects.repeatable_move')
|
||||
-- vim way: ; goes to the direction you were moving.
|
||||
vim.keymap.set({ 'n', 'x', 'o' }, ';', ts_repeat_move.repeat_last_move)
|
||||
vim.keymap.set({ 'n', 'x', 'o' }, ',', ts_repeat_move.repeat_last_move_opposite)
|
||||
|
||||
-- vim way: ; goes to the direction you were moving.
|
||||
vim.keymap.set({ 'n', 'x', 'o' }, ';', ts_repeat_move.repeat_last_move)
|
||||
vim.keymap.set({ 'n', 'x', 'o' }, ',', ts_repeat_move.repeat_last_move_opposite)
|
||||
|
||||
-- Optionally, make builtin f, F, t, T also repeatable with ; and ,
|
||||
vim.keymap.set({ 'n', 'x', 'o' }, 'f', ts_repeat_move.builtin_f)
|
||||
vim.keymap.set({ 'n', 'x', 'o' }, 'F', ts_repeat_move.builtin_F)
|
||||
vim.keymap.set({ 'n', 'x', 'o' }, 't', ts_repeat_move.builtin_t)
|
||||
vim.keymap.set({ 'n', 'x', 'o' }, 'T', ts_repeat_move.builtin_T)
|
||||
end,
|
||||
-- -- Optionally, make builtin f, F, t, T also repeatable with ; and ,
|
||||
-- vim.keymap.set({ 'n', 'x', 'o' }, 'f', ts_repeat_move.builtin_f)
|
||||
-- vim.keymap.set({ 'n', 'x', 'o' }, 'F', ts_repeat_move.builtin_F)
|
||||
-- vim.keymap.set({ 'n', 'x', 'o' }, 't', ts_repeat_move.builtin_t)
|
||||
-- vim.keymap.set({ 'n', 'x', 'o' }, 'T', ts_repeat_move.builtin_T)
|
||||
end,
|
||||
}
|
||||
Reference in New Issue
Block a user