updatyy
This commit is contained in:
parent
f0699c52ac
commit
2f7ce7fc63
7
init.lua
7
init.lua
@ -44,10 +44,3 @@ else
|
|||||||
end
|
end
|
||||||
|
|
||||||
require('normal.normal')
|
require('normal.normal')
|
||||||
|
|
||||||
-- require('Plugin.coc')
|
|
||||||
|
|
||||||
-- require('Plugin.Imchange')
|
|
||||||
-- require('Plugin.lualine')
|
|
||||||
-- require('Plugin.Imchange')
|
|
||||||
-- require('Plugin.NERDTree')
|
|
||||||
|
|||||||
13
lua/G.lua
13
lua/G.lua
@ -18,15 +18,6 @@ function G.map(maps)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function G.hi(hls)
|
|
||||||
for group,color in pairs(hls) do
|
|
||||||
local fg = color.fg and ' ctermfg=' .. color.fg or ' ctermfg=NONE'
|
|
||||||
local bg = color.bg and ' ctermbg=' .. color.bg or ' ctermbg=NONE'
|
|
||||||
local sp = color.sp and ' cterm=' .. color.sp or ''
|
|
||||||
G.api.nvim_command('highlight ' .. group .. fg .. bg .. sp)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function G.cmd(cmd)
|
function G.cmd(cmd)
|
||||||
G.api.nvim_command(cmd)
|
G.api.nvim_command(cmd)
|
||||||
end
|
end
|
||||||
@ -39,8 +30,8 @@ function G.eval(c)
|
|||||||
return G.api.nvim_eval(c)
|
return G.api.nvim_eval(c)
|
||||||
end
|
end
|
||||||
|
|
||||||
function G.au(c)
|
function G.au(even, opts)
|
||||||
return G.api.nvim_create_autocmd(c)
|
return G.api.nvim_create_autocmd(even, opts)
|
||||||
end
|
end
|
||||||
|
|
||||||
G.g.mapleader = ' '
|
G.g.mapleader = ' '
|
||||||
|
|||||||
@ -40,30 +40,30 @@ return {
|
|||||||
{ "n", "gr", "<Plug>(coc-references)", {silent = true} },
|
{ "n", "gr", "<Plug>(coc-references)", {silent = true} },
|
||||||
{ "n", "<leader>rn", "<Plug>(coc-rename)", {silent = true} },
|
{ "n", "<leader>rn", "<Plug>(coc-rename)", {silent = true} },
|
||||||
|
|
||||||
{ "x", "<c-I>", "<Plug>(coc-format-selected)", {silent = true} },
|
{ "v", "<c-I>", "<Plug>(coc-format-selected)", {silent = true} },
|
||||||
{ "n", "<c-I>", "<Plug>(coc-format-selected)", {silent = true} },
|
-- { "n", "<c-I>", "<Plug>(coc-format-selected)", {silent = true} },
|
||||||
|
|
||||||
})
|
})
|
||||||
local keyset = vim.keymap.set
|
-- local keyset = vim.keymap.set
|
||||||
|
|
||||||
|
|
||||||
function _G.check_back_space()
|
function _G.check_back_space()
|
||||||
local col = G.fn.col('.') - 1
|
local col = G.fn.col('.') - 1
|
||||||
return col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') ~= nil
|
return col == 0 or G.fn.getline('.'):sub(col, col):match('%s') ~= nil
|
||||||
end
|
end
|
||||||
|
|
||||||
keyset("n", "[g", "<Plug>(coc-diagnostic-prev)", {silent = true})
|
-- keyset("n", "[g", "<Plug>(coc-diagnostic-prev)", {silent = true})
|
||||||
keyset("n", "]g", "<Plug>(coc-diagnostic-next)", {silent = true})
|
-- keyset("n", "]g", "<Plug>(coc-diagnostic-next)", {silent = true})
|
||||||
|
|
||||||
vim.api.nvim_create_augroup("CocGroup", {})
|
G.api.nvim_create_augroup("CocGroup", {})
|
||||||
vim.api.nvim_create_autocmd("CursorHold", {
|
G.au("CursorHold", {
|
||||||
group = "CocGroup",
|
group = "CocGroup",
|
||||||
command = "silent call CocActionAsync('highlight')",
|
command = "silent call CocActionAsync('highlight')",
|
||||||
desc = "Highlight symbol under cursor on CursorHold"
|
desc = "Highlight symbol under cursor on CursorHold"
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd("FileType", {
|
G.au("FileType", {
|
||||||
group = "CocGroup",
|
group = "CocGroup",
|
||||||
pattern = "typescript,json",
|
pattern = "typescript,json",
|
||||||
command = "setl formatexpr=CocAction('formatSelected')",
|
command = "setl formatexpr=CocAction('formatSelected')",
|
||||||
@ -71,7 +71,7 @@ return {
|
|||||||
})
|
})
|
||||||
|
|
||||||
-- Update signature help on jump placeholder
|
-- Update signature help on jump placeholder
|
||||||
vim.api.nvim_create_autocmd("User", {
|
G.au("User", {
|
||||||
group = "CocGroup",
|
group = "CocGroup",
|
||||||
pattern = "CocJumpPlaceholder",
|
pattern = "CocJumpPlaceholder",
|
||||||
command = "call CocActionAsync('showSignatureHelp')",
|
command = "call CocActionAsync('showSignatureHelp')",
|
||||||
@ -80,92 +80,92 @@ return {
|
|||||||
|
|
||||||
-- Apply codeAction to the selected region
|
-- Apply codeAction to the selected region
|
||||||
-- Example: `<leader>aap` for current paragraph
|
-- Example: `<leader>aap` for current paragraph
|
||||||
local opts = {silent = true, nowait = true}
|
--local opts = {silent = true, nowait = true}
|
||||||
keyset("x", "<leader>a", "<Plug>(coc-codeaction-selected)", opts)
|
--keyset("x", "<leader>a", "<Plug>(coc-codeaction-selected)", opts)
|
||||||
keyset("n", "<leader>a", "<Plug>(coc-codeaction-selected)", opts)
|
--keyset("n", "<leader>a", "<Plug>(coc-codeaction-selected)", opts)
|
||||||
|
|
||||||
-- Remap keys for apply code actions at the cursor position.
|
---- Remap keys for apply code actions at the cursor position.
|
||||||
keyset("n", "<leader>ac", "<Plug>(coc-codeaction-cursor)", opts)
|
--keyset("n", "<leader>ac", "<Plug>(coc-codeaction-cursor)", opts)
|
||||||
-- Remap keys for apply source code actions for current file.
|
---- Remap keys for apply source code actions for current file.
|
||||||
keyset("n", "<leader>as", "<Plug>(coc-codeaction-source)", opts)
|
--keyset("n", "<leader>as", "<Plug>(coc-codeaction-source)", opts)
|
||||||
-- Apply the most preferred quickfix action on the current line.
|
---- Apply the most preferred quickfix action on the current line.
|
||||||
keyset("n", "<leader>qf", "<Plug>(coc-fix-current)", opts)
|
--keyset("n", "<leader>qf", "<Plug>(coc-fix-current)", opts)
|
||||||
|
|
||||||
-- Remap keys for apply refactor code actions.
|
---- Remap keys for apply refactor code actions.
|
||||||
keyset("n", "<leader>re", "<Plug>(coc-codeaction-refactor)", { silent = true })
|
--keyset("n", "<leader>re", "<Plug>(coc-codeaction-refactor)", { silent = true })
|
||||||
keyset("x", "<leader>r", "<Plug>(coc-codeaction-refactor-selected)", { silent = true })
|
--keyset("x", "<leader>r", "<Plug>(coc-codeaction-refactor-selected)", { silent = true })
|
||||||
keyset("n", "<leader>r", "<Plug>(coc-codeaction-refactor-selected)", { silent = true })
|
--keyset("n", "<leader>r", "<Plug>(coc-codeaction-refactor-selected)", { silent = true })
|
||||||
|
|
||||||
-- Run the Code Lens actions on the current line
|
---- Run the Code Lens actions on the current line
|
||||||
keyset("n", "<leader>cl", "<Plug>(coc-codelens-action)", opts)
|
--keyset("n", "<leader>cl", "<Plug>(coc-codelens-action)", opts)
|
||||||
|
|
||||||
|
|
||||||
-- Map function and class text objects
|
---- Map function and class text objects
|
||||||
-- NOTE: Requires 'textDocument.documentSymbol' support from the language server
|
---- NOTE: Requires 'textDocument.documentSymbol' support from the language server
|
||||||
keyset("x", "if", "<Plug>(coc-funcobj-i)", opts)
|
--keyset("x", "if", "<Plug>(coc-funcobj-i)", opts)
|
||||||
keyset("o", "if", "<Plug>(coc-funcobj-i)", opts)
|
--keyset("o", "if", "<Plug>(coc-funcobj-i)", opts)
|
||||||
keyset("x", "af", "<Plug>(coc-funcobj-a)", opts)
|
--keyset("x", "af", "<Plug>(coc-funcobj-a)", opts)
|
||||||
keyset("o", "af", "<Plug>(coc-funcobj-a)", opts)
|
--keyset("o", "af", "<Plug>(coc-funcobj-a)", opts)
|
||||||
keyset("x", "ic", "<Plug>(coc-classobj-i)", opts)
|
--keyset("x", "ic", "<Plug>(coc-classobj-i)", opts)
|
||||||
keyset("o", "ic", "<Plug>(coc-classobj-i)", opts)
|
--keyset("o", "ic", "<Plug>(coc-classobj-i)", opts)
|
||||||
keyset("x", "ac", "<Plug>(coc-classobj-a)", opts)
|
--keyset("x", "ac", "<Plug>(coc-classobj-a)", opts)
|
||||||
keyset("o", "ac", "<Plug>(coc-classobj-a)", opts)
|
--keyset("o", "ac", "<Plug>(coc-classobj-a)", opts)
|
||||||
|
|
||||||
|
|
||||||
-- Remap <C-f> and <C-b> to scroll float windows/popups
|
---- Remap <C-f> and <C-b> to scroll float windows/popups
|
||||||
---@diagnostic disable-next-line: redefined-local
|
-----@diagnostic disable-next-line: redefined-local
|
||||||
local opts = {silent = true, nowait = true, expr = true}
|
--local opts = {silent = true, nowait = true, expr = true}
|
||||||
keyset("n", "<C-f>", 'coc#float#has_scroll() ? coc#float#scroll(1) : "<C-f>"', opts)
|
--keyset("n", "<C-f>", 'coc#float#has_scroll() ? coc#float#scroll(1) : "<C-f>"', opts)
|
||||||
keyset("n", "<C-b>", 'coc#float#has_scroll() ? coc#float#scroll(0) : "<C-b>"', opts)
|
--keyset("n", "<C-b>", 'coc#float#has_scroll() ? coc#float#scroll(0) : "<C-b>"', opts)
|
||||||
keyset("i", "<C-f>",
|
--keyset("i", "<C-f>",
|
||||||
'coc#float#has_scroll() ? "<c-r>=coc#float#scroll(1)<cr>" : "<Right>"', opts)
|
-- 'coc#float#has_scroll() ? "<c-r>=coc#float#scroll(1)<cr>" : "<Right>"', opts)
|
||||||
keyset("i", "<C-b>",
|
--keyset("i", "<C-b>",
|
||||||
'coc#float#has_scroll() ? "<c-r>=coc#float#scroll(0)<cr>" : "<Left>"', opts)
|
-- 'coc#float#has_scroll() ? "<c-r>=coc#float#scroll(0)<cr>" : "<Left>"', opts)
|
||||||
keyset("v", "<C-f>", 'coc#float#has_scroll() ? coc#float#scroll(1) : "<C-f>"', opts)
|
--keyset("v", "<C-f>", 'coc#float#has_scroll() ? coc#float#scroll(1) : "<C-f>"', opts)
|
||||||
keyset("v", "<C-b>", 'coc#float#has_scroll() ? coc#float#scroll(0) : "<C-b>"', opts)
|
--keyset("v", "<C-b>", 'coc#float#has_scroll() ? coc#float#scroll(0) : "<C-b>"', opts)
|
||||||
|
|
||||||
|
|
||||||
-- Use CTRL-S for selections ranges
|
---- Use CTRL-S for selections ranges
|
||||||
-- Requires 'textDocument/selectionRange' support of language server
|
---- Requires 'textDocument/selectionRange' support of language server
|
||||||
keyset("n", "<C-s>", "<Plug>(coc-range-select)", {silent = true})
|
--keyset("n", "<C-s>", "<Plug>(coc-range-select)", {silent = true})
|
||||||
keyset("x", "<C-s>", "<Plug>(coc-range-select)", {silent = true})
|
--keyset("x", "<C-s>", "<Plug>(coc-range-select)", {silent = true})
|
||||||
|
|
||||||
|
|
||||||
-- Add `:Format` command to format current buffer
|
---- Add `:Format` command to format current buffer
|
||||||
vim.api.nvim_create_user_command("Format", "call CocAction('format')", {})
|
--vim.api.nvim_create_user_command("Format", "call CocAction('format')", {})
|
||||||
|
|
||||||
-- " Add `:Fold` command to fold current buffer
|
---- " Add `:Fold` command to fold current buffer
|
||||||
vim.api.nvim_create_user_command("Fold", "call CocAction('fold', <f-args>)", {nargs = '?'})
|
--vim.api.nvim_create_user_command("Fold", "call CocAction('fold', <f-args>)", {nargs = '?'})
|
||||||
|
|
||||||
-- Add `:OR` command for organize imports of the current buffer
|
---- Add `:OR` command for organize imports of the current buffer
|
||||||
vim.api.nvim_create_user_command("OR", "call CocActionAsync('runCommand', 'editor.action.organizeImport')", {})
|
--vim.api.nvim_create_user_command("OR", "call CocActionAsync('runCommand', 'editor.action.organizeImport')", {})
|
||||||
|
|
||||||
-- Add (Neo)Vim's native statusline support
|
---- Add (Neo)Vim's native statusline support
|
||||||
-- NOTE: Please see `:h coc-status` for integrations with external plugins that
|
---- NOTE: Please see `:h coc-status` for integrations with external plugins that
|
||||||
-- provide custom statusline: lightline.vim, vim-airline
|
---- provide custom statusline: lightline.vim, vim-airline
|
||||||
vim.opt.statusline:prepend("%{coc#status()}%{get(b:,'coc_current_function','')}")
|
--vim.opt.statusline:prepend("%{coc#status()}%{get(b:,'coc_current_function','')}")
|
||||||
|
|
||||||
|
|
||||||
-- Mappings for CoCList
|
---- Mappings for CoCList
|
||||||
-- code actions and coc stuff
|
---- code actions and coc stuff
|
||||||
---@diagnostic disable-next-line: redefined-local
|
-----@diagnostic disable-next-line: redefined-local
|
||||||
local opts = {silent = true, nowait = true}
|
--local opts = {silent = true, nowait = true}
|
||||||
-- Show all diagnostics
|
---- Show all diagnostics
|
||||||
keyset("n", "<space>a", ":<C-u>CocList diagnostics<cr>", opts)
|
--keyset("n", "<space>a", ":<C-u>CocList diagnostics<cr>", opts)
|
||||||
-- Manage extensions
|
---- Manage extensions
|
||||||
keyset("n", "<space>e", ":<C-u>CocList extensions<cr>", opts)
|
--keyset("n", "<space>e", ":<C-u>CocList extensions<cr>", opts)
|
||||||
-- Show commands
|
---- Show commands
|
||||||
keyset("n", "<space>c", ":<C-u>CocList commands<cr>", opts)
|
--keyset("n", "<space>c", ":<C-u>CocList commands<cr>", opts)
|
||||||
-- Find symbol of current document
|
---- Find symbol of current document
|
||||||
keyset("n", "<space>o", ":<C-u>CocList outline<cr>", opts)
|
--keyset("n", "<space>o", ":<C-u>CocList outline<cr>", opts)
|
||||||
-- Search workspace symbols
|
---- Search workspace symbols
|
||||||
keyset("n", "<space>s", ":<C-u>CocList -I symbols<cr>", opts)
|
--keyset("n", "<space>s", ":<C-u>CocList -I symbols<cr>", opts)
|
||||||
-- Do default action for next item
|
---- Do default action for next item
|
||||||
keyset("n", "<space>j", ":<C-u>CocNext<cr>", opts)
|
--keyset("n", "<space>j", ":<C-u>CocNext<cr>", opts)
|
||||||
-- Do default action for previous item
|
---- Do default action for previous item
|
||||||
keyset("n", "<space>k", ":<C-u>CocPrev<cr>", opts)
|
--keyset("n", "<space>k", ":<C-u>CocPrev<cr>", opts)
|
||||||
-- Resume latest coc list
|
---- Resume latest coc list
|
||||||
keyset("n", "<space>p", ":<C-u>CocListResume<cr>", opts)
|
--keyset("n", "<space>p", ":<C-u>CocListResume<cr>", opts)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,7 +39,7 @@ G.opt.wrap = false
|
|||||||
G.cmd("filetype plugin indent on")
|
G.cmd("filetype plugin indent on")
|
||||||
|
|
||||||
-- 取消换行注释
|
-- 取消换行注释
|
||||||
G.api.nvim_create_autocmd({ "BufEnter" }, {
|
G.au({ "BufEnter" }, {
|
||||||
pattern = { "*" },
|
pattern = { "*" },
|
||||||
callback = function()
|
callback = function()
|
||||||
-- vim.opt.formatoptions = vim.opt.formatoptions - { "c", "r", "o" }
|
-- vim.opt.formatoptions = vim.opt.formatoptions - { "c", "r", "o" }
|
||||||
@ -49,6 +49,13 @@ G.api.nvim_create_autocmd({ "BufEnter" }, {
|
|||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
G.au({ "InsertEnter" }, {
|
||||||
|
pattern = { "*" },
|
||||||
|
callback = function()
|
||||||
|
G.opt.hlsearch = false
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
-- G.au({
|
-- G.au({
|
||||||
-- {"CmdlineEnter"},
|
-- {"CmdlineEnter"},
|
||||||
-- {
|
-- {
|
||||||
|
|||||||
@ -8,6 +8,7 @@ return {
|
|||||||
--格式整理
|
--格式整理
|
||||||
{
|
{
|
||||||
'junegunn/vim-easy-align',
|
'junegunn/vim-easy-align',
|
||||||
|
lazy = true,
|
||||||
cmd = "EasyAlign",
|
cmd = "EasyAlign",
|
||||||
config = function ()
|
config = function ()
|
||||||
G.map({
|
G.map({
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user