ateijelo/nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updating treesitter

Browse source
This commit is contained in:
Andy Teijelo 2022-11-09 21:54:42 -05:00
parent 35bb137263
commit 9e5738850e
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lua/user/keymaps.lua
View file

@ -29,8 +29,8 @@ keymap("n", "<C-Left>", ":vertical resize -2<CR>", opts)
keymap("n", "<C-Right>", ":vertical resize +2<CR>", opts) keymap("n", "<C-Right>", ":vertical resize +2<CR>", opts)
-- Navigate buffers -- Navigate buffers
keymap("n", "<S-l>", ":bnext<CR>", opts) keymap("n", "<M-l>", ":bnext<CR>", opts)
keymap("n", "<S-h>", ":bprevious<CR>", opts) keymap("n", "<M-h>", ":bprevious<CR>", opts)
for _, mode in ipairs({"n", "i", "v"}) do for _, mode in ipairs({"n", "i", "v"}) do
vim.keymap.set(mode, '<A-1>', "<Cmd>BufferLineGoToBuffer 1<CR>", { noremap = true, silent = true }) vim.keymap.set(mode, '<A-1>', "<Cmd>BufferLineGoToBuffer 1<CR>", { noremap = true, silent = true })
vim.keymap.set(mode, '<A-2>', "<Cmd>BufferLineGoToBuffer 2<CR>", { noremap = true, silent = true }) vim.keymap.set(mode, '<A-2>', "<Cmd>BufferLineGoToBuffer 2<CR>", { noremap = true, silent = true })

1
lua/user/lsp/handlers.lua
View file

@ -68,6 +68,7 @@ local function lsp_keymaps(bufnr)
keymap(bufnr, "n", "<leader>li", "<cmd>LspInfo<cr>", opts) keymap(bufnr, "n", "<leader>li", "<cmd>LspInfo<cr>", opts)
keymap(bufnr, "n", "<leader>lI", "<cmd>LspInstallInfo<cr>", opts) keymap(bufnr, "n", "<leader>lI", "<cmd>LspInstallInfo<cr>", opts)
keymap(bufnr, "n", "<leader>la", "<cmd>lua vim.lsp.buf.code_action()<cr>", opts) keymap(bufnr, "n", "<leader>la", "<cmd>lua vim.lsp.buf.code_action()<cr>", opts)
keymap(bufnr, "n", "<M-.>", "<cmd>lua vim.lsp.buf.code_action()<cr>", opts)
keymap(bufnr, "n", "<leader>lj", "<cmd>lua vim.diagnostic.goto_next({buffer=0})<cr>", opts) keymap(bufnr, "n", "<leader>lj", "<cmd>lua vim.diagnostic.goto_next({buffer=0})<cr>", opts)
keymap(bufnr, "n", "<leader>lk", "<cmd>lua vim.diagnostic.goto_prev({buffer=0})<cr>", opts) keymap(bufnr, "n", "<leader>lk", "<cmd>lua vim.diagnostic.goto_prev({buffer=0})<cr>", opts)
keymap(bufnr, "n", "<leader>lr", "<cmd>lua vim.lsp.buf.rename()<cr>", opts) keymap(bufnr, "n", "<leader>lr", "<cmd>lua vim.lsp.buf.rename()<cr>", opts)

8
lua/user/plugins.lua
View file

@ -46,7 +46,7 @@ return packer.startup(function(use)
-- My plugins here -- My plugins here
use { "wbthomason/packer.nvim", commit = "6afb67460283f0e990d35d229fd38fdc04063e0a" } -- Have packer manage itself use { "wbthomason/packer.nvim", commit = "6afb67460283f0e990d35d229fd38fdc04063e0a" } -- Have packer manage itself
use { "nvim-lua/plenary.nvim", commit = "4b7e52044bbb84242158d977a50c4cbcd85070c7" } -- Useful lua functions used by lots of plugins use { "nvim-lua/plenary.nvim", commit = "4b7e52044bbb84242158d977a50c4cbcd85070c7" } -- Useful lua functions used by lots of plugins
use { "windwp/nvim-autopairs", commit = "4fc96c8f3df89b6d23e5092d31c866c53a346347" } -- Autopairs, integrates with both cmp and treesitter --use { "windwp/nvim-autopairs", commit = "4fc96c8f3df89b6d23e5092d31c866c53a346347" } -- Autopairs, integrates with both cmp and treesitter
use { "numToStr/Comment.nvim", commit = "97a188a98b5a3a6f9b1b850799ac078faa17ab67" } use { "numToStr/Comment.nvim", commit = "97a188a98b5a3a6f9b1b850799ac078faa17ab67" }
use { "JoosepAlviste/nvim-ts-context-commentstring", commit = "4d3a68c41a53add8804f471fcc49bb398fe8de08" } use { "JoosepAlviste/nvim-ts-context-commentstring", commit = "4d3a68c41a53add8804f471fcc49bb398fe8de08" }
use { "kyazdani42/nvim-web-devicons", commit = "563f3635c2d8a7be7933b9e547f7c178ba0d4352" } use { "kyazdani42/nvim-web-devicons", commit = "563f3635c2d8a7be7933b9e547f7c178ba0d4352" }
@ -91,11 +91,11 @@ return packer.startup(function(use)
-- Treesitter -- Treesitter
use { use {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
commit = "8e763332b7bf7b3a426fd8707b7f5aa85823a5ac", commit = "1942f3554184e9d9dfb90dcc6542047b8f6511f2",
} }
use { use {
"nvim-treesitter/nvim-treesitter-context", "nvim-treesitter/nvim-treesitter-context",
commit = "2f9f75d33158c0289c70cc1e0975af9d36ec16b2", commit = "0dd5eae6dbf226107da2c2041ffbb695d9e267c1",
} }
-- Git -- Git
@ -107,7 +107,7 @@ return packer.startup(function(use)
use { "ravenxrz/DAPInstall.nvim", commit = "8798b4c36d33723e7bba6ed6e2c202f84bb300de" } use { "ravenxrz/DAPInstall.nvim", commit = "8798b4c36d33723e7bba6ed6e2c202f84bb300de" }
use { "MunifTanjim/exrc.nvim" } use { "MunifTanjim/exrc.nvim" }
use { "simrat39/rust-tools.nvim" } -- use { "simrat39/rust-tools.nvim" }
use { "mfussenegger/nvim-dap-python" } use { "mfussenegger/nvim-dap-python" }
use 'farmergreg/vim-lastplace' use 'farmergreg/vim-lastplace'

2
lua/user/project.lua
View file

@ -8,7 +8,7 @@ project.setup({
detection_methods = { "pattern" }, detection_methods = { "pattern" },
-- patterns used to detect root dir, when **"pattern"** is in detection_methods -- patterns used to detect root dir, when **"pattern"** is in detection_methods
patterns = { ".git", "Makefile", "package.json", "Cargo.toml" }, patterns = { "serverless.yml", ".git", "Makefile", "package.json", "Cargo.toml" },
}) })
local tele_status_ok, telescope = pcall(require, "telescope") local tele_status_ok, telescope = pcall(require, "telescope")