fix: update to neovim 0.7 and format
This commit is contained in:
@@ -8,6 +8,7 @@ require'lspconfig'.gopls.setup{
|
|||||||
on_attach = require 'lsp'.common_on_attach
|
on_attach = require 'lsp'.common_on_attach
|
||||||
}
|
}
|
||||||
|
|
||||||
|
--[[
|
||||||
require'dap-install'.config("go_delve",{})
|
require'dap-install'.config("go_delve",{})
|
||||||
|
|
||||||
-- DAP
|
-- DAP
|
||||||
|
|||||||
+2
-1
@@ -16,7 +16,7 @@ vim.fn.sign_define(
|
|||||||
{ texthl = "LspDiagnosticsSignInformation", text = "", numhl = "LspDiagnosticsSignInformation" }
|
{ texthl = "LspDiagnosticsSignInformation", text = "", numhl = "LspDiagnosticsSignInformation" }
|
||||||
)
|
)
|
||||||
|
|
||||||
vim.cmd("nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>")
|
vim.cmd("nnoremap gd <cmd>lua vim.lsp.buf.definition()<CR>")
|
||||||
vim.cmd("nnoremap <silent> gD <cmd>lua vim.lsp.buf.declaration()<CR>")
|
vim.cmd("nnoremap <silent> gD <cmd>lua vim.lsp.buf.declaration()<CR>")
|
||||||
vim.cmd("nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>")
|
vim.cmd("nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>")
|
||||||
vim.cmd("nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>")
|
vim.cmd("nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>")
|
||||||
@@ -98,6 +98,7 @@ local function documentHighlight(client, bufnr)
|
|||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local lsp_config = {}
|
local lsp_config = {}
|
||||||
|
|
||||||
if O.document_highlight then
|
if O.document_highlight then
|
||||||
|
|||||||
@@ -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-tree') -- This plugin must be required somewhere before colorscheme. Placing it after will break navigation keymappings
|
||||||
require('pluginconfig/nvim-treesitter')
|
require('pluginconfig/nvim-treesitter')
|
||||||
require('pluginconfig/rnvimr')
|
require('pluginconfig/rnvimr')
|
||||||
require('pluginconfig/symbols-outline')
|
|
||||||
require('pluginconfig/telescope')
|
require('pluginconfig/telescope')
|
||||||
require('pluginconfig/toggleterm')
|
require('pluginconfig/toggleterm')
|
||||||
require('pluginconfig/vim-matchup')
|
require('pluginconfig/vim-matchup')
|
||||||
|
|||||||
@@ -7,13 +7,13 @@ local treesitter = {
|
|||||||
|
|
||||||
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
|
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 = {
|
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
|
-- disable = { "c", "ruby" }, -- optional, list of language that will be disabled
|
||||||
},
|
},
|
||||||
highlight = {
|
highlight = {
|
||||||
enable = treesitter.highlight.enabled, -- false will disable the whole extension
|
enable = true, -- false will disable the whole extension
|
||||||
disable = { "markdown" },
|
disable = { "markdown" },
|
||||||
},
|
},
|
||||||
context_commentstring = {
|
context_commentstring = {
|
||||||
@@ -27,4 +27,3 @@ require'nvim-treesitter.configs'.setup {
|
|||||||
indent = { enable = { "javascriptreact" } },
|
indent = { enable = { "javascriptreact" } },
|
||||||
autotag = { enable = true },
|
autotag = { enable = true },
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
vim.g.symbols_outline = {
|
|
||||||
highlight_hovered_item = true,
|
|
||||||
show_guides = true,
|
|
||||||
auto_preview = true,
|
|
||||||
position = 'right',
|
|
||||||
keymaps = {
|
|
||||||
close = "<Esc>",
|
|
||||||
goto_location = "<Cr>",
|
|
||||||
focus_location = "o",
|
|
||||||
hover_symbol = "<C-space>",
|
|
||||||
rename_symbol = "r",
|
|
||||||
code_actions = "a",
|
|
||||||
},
|
|
||||||
lsp_blacklist = {},
|
|
||||||
}
|
|
||||||
@@ -205,8 +205,6 @@ return require("packer").startup(function(use)
|
|||||||
require_plugin('nvim-colorizer.lua')
|
require_plugin('nvim-colorizer.lua')
|
||||||
use { 'windwp/nvim-spectre', opt = true }
|
use { 'windwp/nvim-spectre', opt = true }
|
||||||
require_plugin('nvim-spectre')
|
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')
|
require_plugin('playground')
|
||||||
-- folke/todo-comments.nvim
|
-- folke/todo-comments.nvim
|
||||||
|
|||||||
Reference in New Issue
Block a user