From c2f762691407f7c484a1c1e73aff2433713ce2bc Mon Sep 17 00:00:00 2001 From: Laily Date: Wed, 27 Apr 2022 10:53:33 +0800 Subject: [PATCH] fix: update to neovim 0.7 and format --- nvim/lua/lang/go.lua | 15 +-- nvim/lua/lsp.lua | 29 +++--- nvim/lua/pluginconfig/init.lua | 1 - nvim/lua/pluginconfig/nvim-treesitter.lua | 23 +++-- nvim/lua/pluginconfig/symbols-outline.lua | 15 --- nvim/lua/plugins.lua | 108 +++++++++++----------- 6 files changed, 87 insertions(+), 104 deletions(-) delete mode 100644 nvim/lua/pluginconfig/symbols-outline.lua diff --git a/nvim/lua/lang/go.lua b/nvim/lua/lang/go.lua index 6f47487..fecdfda 100644 --- a/nvim/lua/lang/go.lua +++ b/nvim/lua/lang/go.lua @@ -1,13 +1,14 @@ -- LSP -require'lspconfig'.gopls.setup{ - -- cmd = {DATA_PATH .. "/lspinstall/go/gopls"}, - cmd = {"gopls","serve"}, -- use cmd in path, I can update it easily - settings = {gopls = {analyses = {unusedparams = true}, staticcheck = true}}, - root_dir = require'lspconfig'.util.root_pattern(".git","go.mod","go.work"), - init_options = {usePlaceholders = true, completeUnimported = true}, - on_attach = require'lsp'.common_on_attach +require 'lspconfig'.gopls.setup { + -- cmd = {DATA_PATH .. "/lspinstall/go/gopls"}, + cmd = { "gopls", "serve" }, -- use cmd in path, I can update it easily + settings = { gopls = { analyses = { unusedparams = true }, staticcheck = true } }, + root_dir = require 'lspconfig'.util.root_pattern(".git", "go.mod", "go.work"), + init_options = { usePlaceholders = true, completeUnimported = true }, + on_attach = require 'lsp'.common_on_attach } +--[[ require'dap-install'.config("go_delve",{}) -- DAP diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua index 77aef25..67033d3 100644 --- a/nvim/lua/lsp.lua +++ b/nvim/lua/lsp.lua @@ -1,22 +1,22 @@ -- TODO figure out why this don't work vim.fn.sign_define( "LspDiagnosticsSignError", - {texthl = "LspDiagnosticsSignError", text = "", numhl = "LspDiagnosticsSignError"} + { texthl = "LspDiagnosticsSignError", text = "", numhl = "LspDiagnosticsSignError" } ) vim.fn.sign_define( "LspDiagnosticsSignWarning", - {texthl = "LspDiagnosticsSignWarning", text = "", numhl = "LspDiagnosticsSignWarning"} + { texthl = "LspDiagnosticsSignWarning", text = "", numhl = "LspDiagnosticsSignWarning" } ) vim.fn.sign_define( "LspDiagnosticsSignHint", - {texthl = "LspDiagnosticsSignHint", text = "", numhl = "LspDiagnosticsSignHint"} + { texthl = "LspDiagnosticsSignHint", text = "", numhl = "LspDiagnosticsSignHint" } ) vim.fn.sign_define( "LspDiagnosticsSignInformation", - {texthl = "LspDiagnosticsSignInformation", text = "", numhl = "LspDiagnosticsSignInformation"} + { texthl = "LspDiagnosticsSignInformation", text = "", numhl = "LspDiagnosticsSignInformation" } ) -vim.cmd("nnoremap gd lua vim.lsp.buf.definition()") +vim.cmd("nnoremap gd lua vim.lsp.buf.definition()") vim.cmd("nnoremap gD lua vim.lsp.buf.declaration()") vim.cmd("nnoremap gr lua vim.lsp.buf.references()") vim.cmd("nnoremap gi lua vim.lsp.buf.implementation()") @@ -34,14 +34,14 @@ vim.cmd('command! -nargs=0 LspVirtualTextToggle lua require("lsp/virtual_text"). -- Set Default Prefix. -- Note: You can set a prefix per lsp server in the lv-globals.lua file vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( - vim.lsp.diagnostic.on_publish_diagnostics, { - virtual_text = { - prefix = "", - spacing = 0, - }, - signs = true, - underline = true, - } + vim.lsp.diagnostic.on_publish_diagnostics, { + virtual_text = { + prefix = "", + spacing = 0, + }, + signs = true, + underline = true, + } ) -- symbols for autocomplete @@ -93,11 +93,12 @@ local function documentHighlight(client, bufnr) autocmd CursorHold lua vim.lsp.buf.document_highlight() autocmd CursorMoved lua vim.lsp.buf.clear_references() augroup END - ]], + ]] , false ) end end + local lsp_config = {} if O.document_highlight then diff --git a/nvim/lua/pluginconfig/init.lua b/nvim/lua/pluginconfig/init.lua index c55cd01..56bacba 100644 --- a/nvim/lua/pluginconfig/init.lua +++ b/nvim/lua/pluginconfig/init.lua @@ -15,7 +15,6 @@ require('pluginconfig/fzf-lua') require('pluginconfig/nvim-tree') -- This plugin must be required somewhere before colorscheme. Placing it after will break navigation keymappings require('pluginconfig/nvim-treesitter') require('pluginconfig/rnvimr') -require('pluginconfig/symbols-outline') require('pluginconfig/telescope') require('pluginconfig/toggleterm') require('pluginconfig/vim-matchup') diff --git a/nvim/lua/pluginconfig/nvim-treesitter.lua b/nvim/lua/pluginconfig/nvim-treesitter.lua index efcd8be..0556751 100644 --- a/nvim/lua/pluginconfig/nvim-treesitter.lua +++ b/nvim/lua/pluginconfig/nvim-treesitter.lua @@ -1,30 +1,29 @@ local treesitter = { ensure_installed = "all", - highlight = {enabled = true}, - playground = {enabled = true}, - rainbow = {enabled = false}, + highlight = { enabled = true }, + playground = { enabled = true }, + rainbow = { enabled = false }, } -require'nvim-treesitter.configs'.setup { +require 'nvim-treesitter.configs'.setup { ensure_installed = treesitter.ensure_installed, -- one of "all", "maintained" (parsers with maintainers), or a list of languages - ignore_install = {"haskell", "markdown"}, + ignore_install = { "haskell", "markdown", "swift" }, matchup = { - enable = true, -- mandatory, false will disable the whole extension + enable = true, -- mandatory, false will disable the whole extension -- disable = { "c", "ruby" }, -- optional, list of language that will be disabled }, highlight = { - enable = treesitter.highlight.enabled, -- false will disable the whole extension + enable = true, -- false will disable the whole extension disable = { "markdown" }, }, context_commentstring = { enable = true, config = { - css = '// %s' + css = '// %s' } - }, + }, -- indent = {enable = true, disable = {"python", "html", "javascript"}}, -- TODO seems to be broken - indent = {enable = {"javascriptreact"}}, - autotag = {enable = true}, + indent = { enable = { "javascriptreact" } }, + autotag = { enable = true }, } - diff --git a/nvim/lua/pluginconfig/symbols-outline.lua b/nvim/lua/pluginconfig/symbols-outline.lua deleted file mode 100644 index 63fb2cf..0000000 --- a/nvim/lua/pluginconfig/symbols-outline.lua +++ /dev/null @@ -1,15 +0,0 @@ -vim.g.symbols_outline = { - highlight_hovered_item = true, - show_guides = true, - auto_preview = true, - position = 'right', - keymaps = { - close = "", - goto_location = "", - focus_location = "o", - hover_symbol = "", - rename_symbol = "r", - code_actions = "a", - }, - lsp_blacklist = {}, -} diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 4dccfac..23fef46 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -35,17 +35,17 @@ return require("packer").startup(function(use) use "wbthomason/packer.nvim" -- TODO refactor all of this (for now it works, but yes I know it could be wrapped in a simpler function) - use {"neovim/nvim-lspconfig", opt = true} - use {'tami5/lspsaga.nvim', branch = 'nvim6.0', opt=true} - use {"williamboman/nvim-lsp-installer", opt = true} - use {"folke/trouble.nvim", opt = true} + use { "neovim/nvim-lspconfig", opt = true } + use { 'tami5/lspsaga.nvim', branch = 'nvim6.0', opt = true } + use { "williamboman/nvim-lsp-installer", opt = true } + use { "folke/trouble.nvim", opt = true } -- Telescope - use {"nvim-lua/popup.nvim", opt = true} - use {"nvim-lua/plenary.nvim", opt = true} - use {"nvim-telescope/telescope.nvim", opt = true} - use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' } - use {"nvim-telescope/telescope-project.nvim", opt = true} + use { "nvim-lua/popup.nvim", opt = true } + use { "nvim-lua/plenary.nvim", opt = true } + use { "nvim-telescope/telescope.nvim", opt = true } + use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' } + use { "nvim-telescope/telescope-project.nvim", opt = true } use { "nvim-telescope/telescope-file-browser.nvim" } use { 'ibhagwan/fzf-lua', @@ -53,69 +53,69 @@ return require("packer").startup(function(use) requires = { 'kyazdani42/nvim-web-devicons' } } - use {'folke/lua-dev.nvim'} - use {"rafcamlet/nvim-luapad"} + use { 'folke/lua-dev.nvim' } + use { "rafcamlet/nvim-luapad" } -- Debugging - use {"mfussenegger/nvim-dap", opt = true} + use { "mfussenegger/nvim-dap", opt = true } -- Autocomplete - use {"hrsh7th/nvim-compe", opt = true} - use {"hrsh7th/vim-vsnip", opt = true} - use {"rafamadriz/friendly-snippets", opt = true} + use { "hrsh7th/nvim-compe", opt = true } + use { "hrsh7th/vim-vsnip", opt = true } + use { "rafamadriz/friendly-snippets", opt = true } -- Treesitter - use {"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"} - use {"windwp/nvim-ts-autotag", opt = true} - use {'andymass/vim-matchup', opt = true} + use { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" } + use { "windwp/nvim-ts-autotag", opt = true } + use { 'andymass/vim-matchup', opt = true } -- Explorer use { 'kyazdani42/nvim-tree.lua', requires = 'kyazdani42/nvim-web-devicons', opt = true, - config = function() require'nvim-tree'.setup {} end + config = function() require 'nvim-tree'.setup {} end } - use {"ahmedkhalf/lsp-rooter.nvim", opt = true} -- with this nvim-tree will follow you + use { "ahmedkhalf/lsp-rooter.nvim", opt = true } -- with this nvim-tree will follow you -- TODO remove when open on dir is supported by nvimtree use "kevinhwang91/rnvimr" -- use {'lukas-reineke/indent-blankline.nvim', opt=true, branch = 'lua'} use { 'lewis6991/gitsigns.nvim', opt = true, requires = { 'nvim-lua/plenary.nvim' } } - use {"folke/which-key.nvim", opt = true} - use {"ChristianChiarulli/dashboard-nvim", opt = true} - use {"windwp/nvim-autopairs", opt = true} - use {"kevinhwang91/nvim-bqf", opt = true} + use { "folke/which-key.nvim", opt = true } + use { "ChristianChiarulli/dashboard-nvim", opt = true } + use { "windwp/nvim-autopairs", opt = true } + use { "kevinhwang91/nvim-bqf", opt = true } -- Comments - use {"terrortylor/nvim-comment", opt = true} - use {'JoosepAlviste/nvim-ts-context-commentstring', opt = true} + use { "terrortylor/nvim-comment", opt = true } + use { 'JoosepAlviste/nvim-ts-context-commentstring', opt = true } -- Color - use {"christianchiarulli/nvcode-color-schemes.vim", opt = true} - use {"npxbr/gruvbox.nvim", requires = {"rktjmp/lush.nvim"}} + use { "christianchiarulli/nvcode-color-schemes.vim", opt = true } + use { "npxbr/gruvbox.nvim", requires = { "rktjmp/lush.nvim" } } -- Icons - use {"kyazdani42/nvim-web-devicons", opt = true} + use { "kyazdani42/nvim-web-devicons", opt = true } -- Status Line and Bufferline - use {"glepnir/galaxyline.nvim", opt = true} - use {"romgrk/barbar.nvim", opt = true} + use { "glepnir/galaxyline.nvim", opt = true } + use { "romgrk/barbar.nvim", opt = true } -- Go plugin -- use {"fatih/vim-go", run= ":GoUpdateBinaries"} -- use {"fatih/vim-go", run = ":GoUpdateBinaries", ft = "go"} -- require_plugin("fatih/vim-go") -- debuger - use {"puremourning/vimspector", opt=true} + use { "puremourning/vimspector", opt = true } require_plugin("vimspector") -- vim test - use {"vim-test/vim-test", opt=true} + use { "vim-test/vim-test", opt = true } require_plugin("vim-test") - use {"kyoh86/vim-go-coverage", opt=true, ft="go"} + use { "kyoh86/vim-go-coverage", opt = true, ft = "go" } require_plugin("vim-go-coverage") - use { "rcarriga/nvim-dap-ui", requires = {"mfussenegger/nvim-dap"} } + use { "rcarriga/nvim-dap-ui", requires = { "mfussenegger/nvim-dap" } } -- Sane gx for netrw_gx bug -- use {"felipec/vim-sanegx"} @@ -150,18 +150,18 @@ return require("packer").startup(function(use) require_plugin('lsp-rooter.nvim') require_plugin("nvim-ts-context-commentstring") - use {'nvim-telescope/telescope-dap.nvim', opt=true} + use { 'nvim-telescope/telescope-dap.nvim', opt = true } require_plugin("telescope-dap.nvim") - use {'theHamsta/nvim-dap-virtual-text', opt=true} + use { 'theHamsta/nvim-dap-virtual-text', opt = true } require_plugin("nvim-dap-virtual-text") - use { "ray-x/lsp_signature.nvim"} + use { "ray-x/lsp_signature.nvim" } use 'tanvirtin/monokai.nvim' use 'fratajczak/one-monokai-vim' - use {"npxbr/glow.nvim", run = "GlowInstall"} + use { "npxbr/glow.nvim", run = "GlowInstall" } - use {"akinsho/nvim-toggleterm.lua"} - use {"Pocco81/DAPInstall.nvim", opt=true} + use { "akinsho/nvim-toggleterm.lua" } + use { "Pocco81/DAPInstall.nvim", opt = true } require_plugin("DAPInstall.nvim") use { @@ -169,17 +169,17 @@ return require("packer").startup(function(use) branch = 'v1', -- optional but strongly recommended config = function() -- you can configure Hop the way you like here; see :h hop-config - require'hop'.setup { keys = 'etovxqpdygfblzhckisuran' } + require 'hop'.setup { keys = 'etovxqpdygfblzhckisuran' } end } -- markdown - use {'godlygeek/tabular'} - use {'preservim/vim-markdown'} + use { 'godlygeek/tabular' } + use { 'preservim/vim-markdown' } use { 'iamcco/markdown-preview.nvim', run = function() vim.fn['mkdp#util#install']() end, - ft = {'markdown'} + ft = { 'markdown' } } --use 'EdenEast/nightfox.nvim' @@ -190,24 +190,22 @@ return require("packer").startup(function(use) -- Extras if O.extras then - use {'metakirby5/codi.vim', opt = true} + use { 'metakirby5/codi.vim', opt = true } require_plugin('codi.vim') --use {'iamcco/markdown-preview.nvim', run = 'cd app && npm install', opt = true} --require_plugin('markdown-preview.nvim') - use {'numToStr/FTerm.nvim', opt = true} + use { 'numToStr/FTerm.nvim', opt = true } require_plugin('FTerm.nvim') - use {'nacro90/numb.nvim', opt = true} + use { 'nacro90/numb.nvim', opt = true } require_plugin('numb.nvim') - use {'turbio/bracey.vim', run = 'npm install --prefix server', opt = true} + use { 'turbio/bracey.vim', run = 'npm install --prefix server', opt = true } require_plugin('bracey.vim') - - use {'norcalli/nvim-colorizer.lua', opt = true} + + use { 'norcalli/nvim-colorizer.lua', opt = true } require_plugin('nvim-colorizer.lua') - use {'windwp/nvim-spectre', opt = true} + use { 'windwp/nvim-spectre', opt = true } require_plugin('nvim-spectre') - use {'simrat39/symbols-outline.nvim', opt = true} - require_plugin('symbols-outline.nvim') - use {'nvim-treesitter/playground', opt = true} + use { 'nvim-treesitter/playground', opt = true } require_plugin('playground') -- folke/todo-comments.nvim -- gennaro-tedesco/nvim-jqx