fix treesitter using new native api
Signed-off-by: Justin Stitt <jstitt007@gmail.com>
This commit is contained in:
parent
797071b4aa
commit
910b4b494c
55
init.lua
55
init.lua
|
|
@ -317,7 +317,7 @@ require('lazy').setup({
|
||||||
-- Then, because we use the `opts` key (recommended), the configuration runs
|
-- Then, because we use the `opts` key (recommended), the configuration runs
|
||||||
-- after the plugin has been loaded as `require(MODULE).setup(opts)`.
|
-- after the plugin has been loaded as `require(MODULE).setup(opts)`.
|
||||||
|
|
||||||
{ -- Useful plugin to show you pending keybinds.
|
{ -- Useful plugin to show you pending keybinds.
|
||||||
'folke/which-key.nvim',
|
'folke/which-key.nvim',
|
||||||
event = 'VimEnter', -- Sets the loading event to 'VimEnter'
|
event = 'VimEnter', -- Sets the loading event to 'VimEnter'
|
||||||
opts = {
|
opts = {
|
||||||
|
|
@ -398,7 +398,7 @@ require('lazy').setup({
|
||||||
{ 'nvim-telescope/telescope-ui-select.nvim' },
|
{ 'nvim-telescope/telescope-ui-select.nvim' },
|
||||||
|
|
||||||
-- Useful for getting pretty icons, but requires a Nerd Font.
|
-- Useful for getting pretty icons, but requires a Nerd Font.
|
||||||
{ 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
|
{ 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
-- Telescope is a fuzzy finder that comes with a lot of different things that
|
-- Telescope is a fuzzy finder that comes with a lot of different things that
|
||||||
|
|
@ -507,15 +507,18 @@ require('lazy').setup({
|
||||||
'WhoIsSethDaniel/mason-tool-installer.nvim',
|
'WhoIsSethDaniel/mason-tool-installer.nvim',
|
||||||
|
|
||||||
-- Useful status updates for LSP.
|
-- Useful status updates for LSP.
|
||||||
{ 'j-hui/fidget.nvim', opts = {} },
|
{ 'j-hui/fidget.nvim', opts = {} },
|
||||||
|
|
||||||
-- Allows extra capabilities provided by blink.cmp
|
-- Allows extra capabilities provided by blink.cmp
|
||||||
-- Autocomplete addition to <C-y> to <CR>
|
-- Autocomplete addition to <C-y> to <CR>
|
||||||
{ 'saghen/blink.cmp', opts = {
|
{
|
||||||
keymap = {
|
'saghen/blink.cmp',
|
||||||
['<CR>'] = { 'select_and_accept', 'fallback' },
|
opts = {
|
||||||
},
|
keymap = {
|
||||||
} },
|
['<CR>'] = { 'select_and_accept', 'fallback' },
|
||||||
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
-- Brief aside: **What is LSP?**
|
-- Brief aside: **What is LSP?**
|
||||||
|
|
@ -912,9 +915,9 @@ require('lazy').setup({
|
||||||
config = function()
|
config = function()
|
||||||
---@diagnostic disable-next-line: missing-fields
|
---@diagnostic disable-next-line: missing-fields
|
||||||
require('catppuccin').setup {
|
require('catppuccin').setup {
|
||||||
flavour = 'mocha', -- latte, frappe, macchiato, mocha
|
flavour = 'mocha', -- latte, frappe, macchiato, mocha
|
||||||
background = { dark = 'mocha', light = 'latte' }, -- set background for light/dark mode
|
background = { dark = 'mocha', light = 'latte' }, -- set background for light/dark mode
|
||||||
transparent_background = false, -- disables setting the background color
|
transparent_background = false, -- disables setting the background color
|
||||||
integrations = {
|
integrations = {
|
||||||
cmp = true,
|
cmp = true,
|
||||||
gitsigns = true,
|
gitsigns = true,
|
||||||
|
|
@ -972,27 +975,17 @@ require('lazy').setup({
|
||||||
'nvim-treesitter/nvim-treesitter',
|
'nvim-treesitter/nvim-treesitter',
|
||||||
branch = 'master',
|
branch = 'master',
|
||||||
build = ':TSUpdate',
|
build = ':TSUpdate',
|
||||||
main = 'nvim-treesitter.config', -- Sets main module to use for opts
|
config = function()
|
||||||
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
|
require('nvim-treesitter').setup({
|
||||||
opts = {
|
ensure_installed = { 'bash', 'c', 'css', 'diff', 'html', 'javascript', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'typescript', 'vim', 'vimdoc', 'svelte' },
|
||||||
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
|
auto_install = true,
|
||||||
-- Autoinstall languages that are not installed
|
})
|
||||||
auto_install = true,
|
vim.api.nvim_create_autocmd('FileType', {
|
||||||
highlight = {
|
callback = function()
|
||||||
enable = true,
|
pcall(vim.treesitter.start)
|
||||||
-- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.
|
end,
|
||||||
-- If you are experiencing weird indenting issues, add the language to
|
})
|
||||||
-- the list of additional_vim_regex_highlighting and disabled languages for indent.
|
end,
|
||||||
additional_vim_regex_highlighting = { 'ruby' },
|
|
||||||
},
|
|
||||||
indent = { enable = true, disable = { 'ruby' } },
|
|
||||||
},
|
|
||||||
-- There are additional nvim-treesitter modules that you can use to interact
|
|
||||||
-- with nvim-treesitter. You should go explore a few and see what interests you:
|
|
||||||
--
|
|
||||||
-- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod`
|
|
||||||
-- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context
|
|
||||||
-- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
|
|
||||||
},
|
},
|
||||||
|
|
||||||
-- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the
|
-- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue