Skip to content

Commit 1708a41

Browse files
pzeronemayronH
authored andcommitted
Removed duplicate line (nvim-lua#583)
1 parent daa546c commit 1708a41

File tree

1 file changed

+75
-0
lines changed

1 file changed

+75
-0
lines changed

init.lua

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,83 @@ require 'keymaps'
6161
require 'telescope-setup'
6262

6363
-- [[ Configure Treesitter ]]
64+
<<<<<<< HEAD
6465
-- (syntax parser for highlighting)
6566
require 'treesitter-setup'
67+
=======
68+
-- See `:help nvim-treesitter`
69+
-- Defer Treesitter setup after first render to improve startup time of 'nvim {filename}'
70+
vim.defer_fn(function()
71+
require('nvim-treesitter.configs').setup {
72+
-- Add languages to be installed here that you want installed for treesitter
73+
ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
74+
75+
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
76+
auto_install = false,
77+
-- Install languages synchronously (only applied to `ensure_installed`)
78+
sync_install = false,
79+
-- List of parsers to ignore installing
80+
ignore_install = {},
81+
-- You can specify additional Treesitter modules here: -- For example: -- playground = {--enable = true,-- },
82+
modules = {},
83+
highlight = { enable = true },
84+
indent = { enable = true },
85+
incremental_selection = {
86+
enable = true,
87+
keymaps = {
88+
init_selection = '<c-space>',
89+
node_incremental = '<c-space>',
90+
scope_incremental = '<c-s>',
91+
node_decremental = '<M-space>',
92+
},
93+
},
94+
textobjects = {
95+
select = {
96+
enable = true,
97+
lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
98+
keymaps = {
99+
-- You can use the capture groups defined in textobjects.scm
100+
['aa'] = '@parameter.outer',
101+
['ia'] = '@parameter.inner',
102+
['af'] = '@function.outer',
103+
['if'] = '@function.inner',
104+
['ac'] = '@class.outer',
105+
['ic'] = '@class.inner',
106+
},
107+
},
108+
move = {
109+
enable = true,
110+
set_jumps = true, -- whether to set jumps in the jumplist
111+
goto_next_start = {
112+
[']m'] = '@function.outer',
113+
[']]'] = '@class.outer',
114+
},
115+
goto_next_end = {
116+
[']M'] = '@function.outer',
117+
[']['] = '@class.outer',
118+
},
119+
goto_previous_start = {
120+
['[m'] = '@function.outer',
121+
['[['] = '@class.outer',
122+
},
123+
goto_previous_end = {
124+
['[M'] = '@function.outer',
125+
['[]'] = '@class.outer',
126+
},
127+
},
128+
swap = {
129+
enable = true,
130+
swap_next = {
131+
['<leader>a'] = '@parameter.inner',
132+
},
133+
swap_previous = {
134+
['<leader>A'] = '@parameter.inner',
135+
},
136+
},
137+
},
138+
}
139+
end, 0)
140+
>>>>>>> 2510c29 (Removed duplicate line (#583))
66141

67142
-- [[ Configure LSP ]]
68143
-- (Language Server Protocol)

0 commit comments

Comments
 (0)