From 7ec922d13053bac04ed5500fc92dca3cfdb8f580 Mon Sep 17 00:00:00 2001 From: c-my Date: Sat, 16 Apr 2022 12:26:04 +0800 Subject: [PATCH] fix: remove useless pcall --- README.md | 3 ++- lua/configs/plugins/autopairs.lua | 5 +---- lua/configs/plugins/better_escape.lua | 6 +----- lua/configs/plugins/bufferline.lua | 5 +---- lua/configs/plugins/cmp.lua | 17 +++-------------- lua/configs/plugins/comment.lua | 5 +---- lua/configs/plugins/gitsigns.lua | 6 +----- lua/configs/plugins/lsp_installer.lua | 6 +----- lua/configs/plugins/null_ls.lua | 6 +----- lua/configs/plugins/nvimtree.lua | 5 +---- lua/configs/plugins/packer.lua | 5 +++++ lua/configs/plugins/treesitter.lua | 6 ++++++ 12 files changed, 24 insertions(+), 51 deletions(-) create mode 100644 lua/configs/plugins/treesitter.lua diff --git a/README.md b/README.md index 366ac09..98b51ce 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,8 @@ * [ewis6991/gitsigns.nvim](https://github.com/lewis6991/gitsigns.nvim) * [lewis6991/impatient.nvim](https://github.com/lewis6991/impatient.nvim) * [williamboman/nvim-lsp-installer](https://github.com/williamboman/nvim-lsp-installer) -* [rcarriga/nvim-notify](https://github.com/rcarriga/nvim-notify) +* [nvim-lualine/lualine.nvim](https://github.com/nvim-lualine/lualine.nvim) +* * [kyazdani42/nvim-tree.lua](https://github.com/kyazdani42/nvim-tree.lua) * [nvim-telescope/telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) diff --git a/lua/configs/plugins/autopairs.lua b/lua/configs/plugins/autopairs.lua index 1c7ece3..39284aa 100644 --- a/lua/configs/plugins/autopairs.lua +++ b/lua/configs/plugins/autopairs.lua @@ -1,7 +1,4 @@ -local present, autopairs = pcall(require, "nvim-autopairs") -if not present then - return -end +local autopairs = require('nvim-autopairs') autopairs.setup({ fast_wrap = {}, diff --git a/lua/configs/plugins/better_escape.lua b/lua/configs/plugins/better_escape.lua index 6d5c19a..5b60940 100644 --- a/lua/configs/plugins/better_escape.lua +++ b/lua/configs/plugins/better_escape.lua @@ -1,8 +1,4 @@ -local present, escape = pcall(require, 'better_escape') -if not present then - print "no escape" - return -end +local escape = require('better_escape') escape.setup({ mapping = { 'jk' }, diff --git a/lua/configs/plugins/bufferline.lua b/lua/configs/plugins/bufferline.lua index 8e546c8..c8cd98d 100644 --- a/lua/configs/plugins/bufferline.lua +++ b/lua/configs/plugins/bufferline.lua @@ -1,7 +1,4 @@ -local present, bufferline = pcall(require, 'bufferline') -if not present then - return -end +local bufferline = require('bufferline') local opts = { noremap = true, diff --git a/lua/configs/plugins/cmp.lua b/lua/configs/plugins/cmp.lua index 35c78b7..360b9c5 100644 --- a/lua/configs/plugins/cmp.lua +++ b/lua/configs/plugins/cmp.lua @@ -1,19 +1,8 @@ -local present_cmp, cmp = pcall(require, 'cmp') -if not present_cmp then - print 'no cmp' - return -end +local cmp = require('cmp') -local present_lua, luasnip = pcall(require, 'luasnip') -if not present_lua then - print 'no luasnip' - return -end +local luasnip = require('luasnip') -local present_auto_pair, cmp_autopairs = pcall(require, 'nvim-autopairs.completion.cmp') -if not present_auto_pair then - return -end +local cmp_autopairs = require('nvim-autopairs.completion.cmp') require("luasnip.loaders.from_vscode").lazy_load() diff --git a/lua/configs/plugins/comment.lua b/lua/configs/plugins/comment.lua index 0f0d087..18fdda0 100644 --- a/lua/configs/plugins/comment.lua +++ b/lua/configs/plugins/comment.lua @@ -1,6 +1,3 @@ -local present, comment = pcall(require, 'Comment') -if not present then - return -end +local comment = require('Comment') comment.setup() diff --git a/lua/configs/plugins/gitsigns.lua b/lua/configs/plugins/gitsigns.lua index 557ce68..8e96255 100644 --- a/lua/configs/plugins/gitsigns.lua +++ b/lua/configs/plugins/gitsigns.lua @@ -1,7 +1,3 @@ -local present, gitsigns = pcall(require, "gitsigns") -if not present then - print "no gitsigns" - return -end +local gitsigns = require('gitsigns') gitsigns.setup() diff --git a/lua/configs/plugins/lsp_installer.lua b/lua/configs/plugins/lsp_installer.lua index 3611f0f..f17296b 100644 --- a/lua/configs/plugins/lsp_installer.lua +++ b/lua/configs/plugins/lsp_installer.lua @@ -1,8 +1,4 @@ -local present, lsp_installer = pcall(require, 'nvim-lsp-installer') -if not present then - print 'no lsp installer' - return -end +local lsp_installer = require('nvim-lsp-installer') -- Use an on_attach function to only map the following keys -- after the language server attaches to the current buffer diff --git a/lua/configs/plugins/null_ls.lua b/lua/configs/plugins/null_ls.lua index 6340926..947751f 100644 --- a/lua/configs/plugins/null_ls.lua +++ b/lua/configs/plugins/null_ls.lua @@ -1,8 +1,4 @@ -local present, null_ls = pcall(require, 'null-ls') -if not present then - vim.notify('no null-ls') - return -end +local null_ls = require('null-ls') null_ls.setup({ sources = { diff --git a/lua/configs/plugins/nvimtree.lua b/lua/configs/plugins/nvimtree.lua index 1644214..0298280 100644 --- a/lua/configs/plugins/nvimtree.lua +++ b/lua/configs/plugins/nvimtree.lua @@ -1,7 +1,4 @@ -local present, nvimtree = pcall(require, "nvim-tree") -if not present then - return -end +local nvimtree = require("nvim-tree") vim.g.nvim_tree_group_empty = 1 diff --git a/lua/configs/plugins/packer.lua b/lua/configs/plugins/packer.lua index fe38abd..78a0b3e 100644 --- a/lua/configs/plugins/packer.lua +++ b/lua/configs/plugins/packer.lua @@ -26,6 +26,11 @@ return packer.startup(function(use) -- My plugins here use 'wbthomason/packer.nvim' use 'lewis6991/impatient.nvim' + use { 'nvim-treesitter/nvim-treesitter', + config = function() + require('configs.plugins.treesitter') + end + } use { 'windwp/nvim-autopairs', -- Can't lazyloaded because cmp-related config = function() diff --git a/lua/configs/plugins/treesitter.lua b/lua/configs/plugins/treesitter.lua new file mode 100644 index 0000000..21a4719 --- /dev/null +++ b/lua/configs/plugins/treesitter.lua @@ -0,0 +1,6 @@ +require('nvim-treesitter.configs').setup({ + ensure_installed = { 'c', 'cpp', 'go', 'java', 'json', 'lua', 'python' }, + highlight = { + enable = true, + } +})