diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..585e17e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,15 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true +charset = utf-8 + +[*.{lua,vim}] +indent_size = tab +indent_style = tab +tab_width = 4 +trim_trailing_whitespace = true + +[*.{lua}] +max_line_length = 140 diff --git a/after/ftplugin/bib.vim b/after/ftplugin/bib.vim deleted file mode 100644 index a4f9c7a..0000000 --- a/after/ftplugin/bib.vim +++ /dev/null @@ -1 +0,0 @@ -map f :%!bibformat diff --git a/after/ftplugin/c.vim b/after/ftplugin/c.vim deleted file mode 100644 index 6dd71c1..0000000 --- a/after/ftplugin/c.vim +++ /dev/null @@ -1,4 +0,0 @@ -let c_space_errors = 1 -let c_space_errors = 1 -let c_no_comment_fold = 1 -let g:syntastic_c_checkers=['make'] diff --git a/after/ftplugin/html.vim b/after/ftplugin/html.vim deleted file mode 100644 index c9f4a81..0000000 --- a/after/ftplugin/html.vim +++ /dev/null @@ -1 +0,0 @@ -imap ==A diff --git a/after/ftplugin/java.lua b/after/ftplugin/java.lua new file mode 100644 index 0000000..5284c6d --- /dev/null +++ b/after/ftplugin/java.lua @@ -0,0 +1,30 @@ +vim.api.nvim_buf_set_option(0, "textwidth", 120) +vim.cmd.iabbrev("syso", "System.out.println") + +local bmap = vim.keymap.set +local map_opt = { silent = true, buffer = true } + +bmap("n", "ev", function() + require("jdtls").extract_variable() +end, { silent = true, buffer = true, desc = "Extract variable" }) +bmap("v", "ev", function() + require("jdtls").extract_variable(true) +end, { silent = true, buffer = true, desc = "Extract variable" }) +bmap("n", "ec", function() + require("jdtls").extract_constant() +end, { silent = true, buffer = true, desc = "Extract constant" }) +bmap("v", "ec", function() + require("jdtls").extract_constant(true) +end, { silent = true, buffer = true, desc = "Extract constant" }) +bmap("v", "em", function() + require("jdtls").extract_method(true) +end, { silent = true, buffer = true, desc = "Extract method" }) +bmap("n", "ro", function() + require("jdtls").organize_imports() +end, { silent = true, buffer = true, desc = "Organize imports" }) +bmap("n", "tc", function() + require("jdtls").test_class() +end, { silent = true, buffer = true, desc = "Test class" }) +bmap("n", "tm", function() + require("jdtls").test_nearest_method() +end, { silent = true, buffer = true, desc = "Test nearest method" }) diff --git a/after/ftplugin/java.vim b/after/ftplugin/java.vim deleted file mode 100644 index 5beb8f9..0000000 --- a/after/ftplugin/java.vim +++ /dev/null @@ -1,42 +0,0 @@ -iab syso System.out.println - -setlocal foldmethod=syntax -setlocal foldenable -setlocal textwidth=120 - -nnoremap jc :JavaCorrect -nnoremap jd :JavaDocComment -nnoremap :JavaDocPreview -nnoremap :JavaSearchContext -nnoremap jf :%JavaFormat -nnoremap ji :JavaImportOrganize -nnoremap jr :JavaRename - -inoremap pumvisible() \|\| &omnifunc == '' ? -\ "\C-n>" : -\ "\C-x>\C-o>=pumvisible() ?" . -\ "\"\\c-n>\\c-p>\\c-n>\" :" . -\ "\" \\bs>\\C-n>\"\" -imap map - -function! InsertJavaPackage() - let filename = expand("%") - let filename = substitute(filename, "\.java$", "", "") - let dir = getcwd() . "/" . filename - let dir = substitute(dir, "^.*\/src\/", "", "") - let dir = substitute(dir, "\/[^\/]*$", "", "") - let dir = substitute(dir, "\/", ".", "g") - let filename = substitute(filename, "^.*\/", "", "") - let dir = "package " . dir . ";" - let result = append(0, dir) - let result = append(1, "") - let result = append(2, "class " . filename . " {") - let result = append(4, "}") -endfunction - -"java {{{ -"if filereadable(bufname("%")) == 0 -" call InsertJavaPackage() -"endif - -"}}} diff --git a/after/ftplugin/mail.vim b/after/ftplugin/mail.vim index 1eb4bff..36fc8aa 100644 --- a/after/ftplugin/mail.vim +++ b/after/ftplugin/mail.vim @@ -1,3 +1,3 @@ iabbr mfg Mit freundlichen Grüßen - -set fdl=99 +setlocal spell +setlocal fdl=99 diff --git a/after/ftplugin/markdown.lua b/after/ftplugin/markdown.lua new file mode 100644 index 0000000..cd54204 --- /dev/null +++ b/after/ftplugin/markdown.lua @@ -0,0 +1,3 @@ +vim.g.markdown_fenced_languages = { "html", "python", "scala", "js=javascript" } +vim.g.markdown_composer_autostart = 0 +vim.o.textwidth = 80 diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim deleted file mode 100644 index 2424615..0000000 --- a/after/ftplugin/markdown.vim +++ /dev/null @@ -1,2 +0,0 @@ -let g:markdown_fenced_languages = ['html', 'python', 'scala', 'js=javascript'] -let g:markdown_composer_autostart = 0 diff --git a/after/ftplugin/python.lua b/after/ftplugin/python.lua new file mode 100644 index 0000000..8412fc6 --- /dev/null +++ b/after/ftplugin/python.lua @@ -0,0 +1,4 @@ +vim.o.tabstop = 4 +vim.o.shiftwidth = 4 +vim.o.expandtab = true +vim.o.textwidth = 120 diff --git a/after/ftplugin/python.vim b/after/ftplugin/python.vim deleted file mode 100644 index 6e9f958..0000000 --- a/after/ftplugin/python.vim +++ /dev/null @@ -1 +0,0 @@ -set ts=4 sw=4 et diff --git a/after/ftplugin/ruby.vim b/after/ftplugin/ruby.vim index 9be0081..8c3ca50 100644 --- a/after/ftplugin/ruby.vim +++ b/after/ftplugin/ruby.vim @@ -1,10 +1,4 @@ setl sts=2 setl sw=2 setl expandtab -setl omnifunc=rubycomplete#Complete -let g:rubycomplete_buffer_loading = 1 -let g:rubycomplete_classes_in_global = 1 - -nmap K :!ri - hi link rubySymbol Special diff --git a/after/ftplugin/scala.vim b/after/ftplugin/scala.vim index 60759ed..94c88ca 100644 --- a/after/ftplugin/scala.vim +++ b/after/ftplugin/scala.vim @@ -1,5 +1,9 @@ -imap //< (codelines-close) +imap (codelines-close) map cl :call jobstart(['codelines', '.']) set tw=120 set foldlevel=99 + +set foldmethod=indent +"set foldmethod=expr +"set foldexpr=nvim_treesitter#foldexpr() diff --git a/after/ftplugin/scss.lua b/after/ftplugin/scss.lua new file mode 100644 index 0000000..a2c958b --- /dev/null +++ b/after/ftplugin/scss.lua @@ -0,0 +1,3 @@ +vim.keymap.set("n", "s", function() + require("nvim-quick-switcher").toggle("tsx", "scss") +end, { buffer = true }) diff --git a/after/ftplugin/tex.vim b/after/ftplugin/tex.vim index e04fe7f..88c0487 100644 --- a/after/ftplugin/tex.vim +++ b/after/ftplugin/tex.vim @@ -1,11 +1,3 @@ -if exists("&cole") - " conceal" Use conceal vim 7.3 feature: - set cole=0 " conceal level - " Conceal in tex file: "admgs", a=accents, d=delimiters, m=math symbols, - " g=Greek, s=superscripts/subscripts: - let g:tex_conceal="agm" -endif - imap [[ \begin{ imap ]] (vimtex-delim-close) imap [( \left( diff --git a/after/ftplugin/text.lua b/after/ftplugin/text.lua new file mode 100644 index 0000000..6ae2d3c --- /dev/null +++ b/after/ftplugin/text.lua @@ -0,0 +1 @@ +vim.o.textwidth = 80 diff --git a/after/ftplugin/typescript.lua b/after/ftplugin/typescript.lua new file mode 100644 index 0000000..bc3858d --- /dev/null +++ b/after/ftplugin/typescript.lua @@ -0,0 +1,87 @@ +vim.o.textwidth = 120 + +vim.keymap.set("n", "o", function() + vim.lsp.buf.execute_command({ command = "_typescript.organizeImports", arguments = { vim.fn.expand("%:p") } }) +end, { desc = "Organize imports" }) +vim.keymap.set("n", "s", function() + require("nvim-quick-switcher").toggle("tsx", "scss") +end, { buffer = true }) + +local function goToCSSClassDefinition() + local node = vim.treesitter.get_node() + if not node then + return false + end + + local parent = node:parent() + if not parent then + return false + end + + local grandparent = parent:parent() + if not grandparent then + return false + end + + local className + if + node:type() == "string_fragment" + and grandparent:type() == "jsx_attribute" + and vim.treesitter.get_node_text(grandparent:named_child(0), 0) == "className" + then + className = vim.treesitter.get_node_text(node, 0) + elseif + parent:type() == "jsx_attribute" and vim.treesitter.get_node_text(parent:named_child(0), 0) == "className" + then + className = vim.treesitter.get_node_text(parent:named_child(1):named_child(0), 0) + elseif node:type() == "jsx_attribute" and vim.treesitter.get_node_text(node:named_child(0), 0) == "className" then + className = vim.treesitter.get_node_text(node:named_child(1):named_child(0), 0) + end + + if className then + require("nvim-quick-switcher").toggle("tsx", "scss", { only_existing = true }) + local query = vim.treesitter.query.parse("scss", '((class_name) @cn (#eq? @cn "' .. className .. '"))') + local node = vim.treesitter.get_node() + if not node then + return false + end + local tree = node:tree() + vim.fn.setqflist({}) + local start, _, stop, _ = tree:root():range() + local anyMatch = false + for _, match, _ in query:iter_matches(tree:root(), 0, start, stop) do + anyMatch = true + for _, node in pairs(match) do + local row, col = node:start() + vim.api.nvim_win_set_cursor(0, { row + 1, col }) + vim.fn.setqflist({ + { + lnum = row + 1, + col = col + 1, + text = "class selector: " .. className, + filename = vim.fn.expand("%:p"), + bufnr = vim.fn.bufnr("%"), + }, + }, "a") + end + end + if not anyMatch then + require("nvim-quick-switcher").toggle("tsx", "scss", { only_existing = true }) + end + return true + end + return false +end + +vim.api.nvim_create_autocmd("LspAttach", { + callback = function() + vim.keymap.set("n", "gd", function() + if not goToCSSClassDefinition() then + require("telescope.builtin").lsp_definitions() + end + end, { buffer = true }) + end, +}) + +vim.o.foldmethod = "expr" +vim.o.foldexpr = "nvim_treesitter#foldexpr()" diff --git a/after/ftplugin/typescriptreact.lua b/after/ftplugin/typescriptreact.lua new file mode 120000 index 0000000..ede1851 --- /dev/null +++ b/after/ftplugin/typescriptreact.lua @@ -0,0 +1 @@ +typescript.lua \ No newline at end of file diff --git a/after/plugin/airline.vim b/after/plugin/airline.vim deleted file mode 100644 index dc78b32..0000000 --- a/after/plugin/airline.vim +++ /dev/null @@ -1,18 +0,0 @@ -let g:airline_powerline_fonts = 1 -let g:airline_left_sep = '' -let g:airline_left_alt_sep = '' -let g:airline_right_sep = '' -let g:airline_right_alt_sep = '' -let g:airline_symbols.branch = '' -let g:airline_symbols.readonly = '' -let g:airline_symbols.linenr = '' -let g:airline_section_z = 'L:%l/%L C:%v' - -function! LspStatus() abort - let status = luaeval('require("lsp-status").status()') - return trim(status) -endfunction -call airline#parts#define_function('lsp_status', 'LspStatus') -call airline#parts#define_condition('lsp_status', 'luaeval("#vim.lsp.buf_get_clients() > 0")') -let g:airline#extensions#nvimlsp#enabled = 0 -let g:airline_section_warning = airline#section#create_right(['lsp_status']) diff --git a/after/plugin/autoformat.vim b/after/plugin/autoformat.vim deleted file mode 100644 index b7ec72d..0000000 --- a/after/plugin/autoformat.vim +++ /dev/null @@ -1,2 +0,0 @@ -let g:formatdef_scalafmt = '"scalafmt --stdin 2>/dev/null"' -let g:formatters_scala = ['scalafmt'] diff --git a/after/plugin/c.vim b/after/plugin/c.vim index 09e6281..8a96d9f 100644 --- a/after/plugin/c.vim +++ b/after/plugin/c.vim @@ -1,4 +1,3 @@ - "{{{ c header gates function! s:insert_gates() let gatename = substitute(toupper(expand("%:t")), "\\.", "_", "g") @@ -8,5 +7,4 @@ function! s:insert_gates() normal! kk endfunction autocmd BufNewFile *.{h,hpp} call insert_gates() - "}}} diff --git a/after/plugin/centerscroll.vim b/after/plugin/centerscroll.vim deleted file mode 100644 index 24c9f0e..0000000 --- a/after/plugin/centerscroll.vim +++ /dev/null @@ -1,17 +0,0 @@ -set scrolloff=99999 -set lazyredraw - -nnoremap 11kzz -nnoremap 11jzz -nnoremap j gjzz -nnoremap k gkzz -nnoremap # #zz -nnoremap * *zz -nnoremap n nzz -nnoremap N Nzz -nnoremap gg ggzz -nnoremap G Gzz -nnoremap gj jzz -nnoremap gk kzz -vnoremap < >gv diff --git a/after/plugin/coc.vim b/after/plugin/coc.vim deleted file mode 100644 index ca3afb4..0000000 --- a/after/plugin/coc.vim +++ /dev/null @@ -1,20 +0,0 @@ -if exists(":CocAction") - set signcolumn=yes - map gd (coc-definition) - - map call CocAction("doHover") - map t (coc-type-definition) - map u (coc-references) - map r (coc-rename) - map q (coc-quickfix) - - map F (coc-format) - map f (coc-format-selected) - vmap f (coc-format-selected) - - map (coc-codeaction) - vmap (coc-codeaction-selected) - - omap af (coc-funcobj-a) - omap if (coc-funcobj-i) -endif diff --git a/after/plugin/compe.vim b/after/plugin/compe.vim deleted file mode 100644 index a4ea8a8..0000000 --- a/after/plugin/compe.vim +++ /dev/null @@ -1,7 +0,0 @@ -if exists('g:loaded_compe') - inoremap compe#complete() - inoremap compe#confirm('') - inoremap compe#close('') - inoremap compe#scroll({ 'delta': +4 }) - inoremap compe#scroll({ 'delta': -4 }) -endif diff --git a/after/plugin/fzf.vim b/after/plugin/fzf.vim deleted file mode 100644 index 04caade..0000000 --- a/after/plugin/fzf.vim +++ /dev/null @@ -1,7 +0,0 @@ -map gf :GFiles -map gf :Files -map gb :Buffers -map gs :GFiles? -map ag :Ag - -imap (fzf-complete-file) diff --git a/after/plugin/general.vim b/after/plugin/general.vim deleted file mode 100644 index b816a66..0000000 --- a/after/plugin/general.vim +++ /dev/null @@ -1,19 +0,0 @@ -let g:deoplete#enable_at_startup = 1 -if !exists('g:deoplete#omni#input_patterns') - let g:deoplete#omni#input_patterns = {} -endif - -" , : close popup and delete backword char. -"inoremap deoplete#smart_close_popup()."\" -"inoremap deoplete#smart_close_popup()."\" - -"inoremap -" \ pumvisible() ? "\" : -" \ check_back_space() ? "\" : -" \ '\' - -function! s:check_back_space() - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~ '\s' -endfunction -"inoremap diff --git a/after/plugin/genghis.lua b/after/plugin/genghis.lua new file mode 100644 index 0000000..87e4534 --- /dev/null +++ b/after/plugin/genghis.lua @@ -0,0 +1,3 @@ +vim.api.nvim_create_user_command("Trash", function() + require("genghis").trashFile({ trashCmd = "rm" }) +end, { desc = "Delete current file" }) diff --git a/after/plugin/gitgutter.vim b/after/plugin/gitgutter.vim deleted file mode 100644 index 8fe5645..0000000 --- a/after/plugin/gitgutter.vim +++ /dev/null @@ -1,5 +0,0 @@ -hi link GitGutterAddLineNr DiffAdd -hi link GitGutterChangeLineNr DiffChange -hi link GitGutterDeleteLineNr DiffDelete -hi link GitGutterChangeDeleteLineNr GitGutterChangeLine -GitGutterLineNrHighlightsEnable diff --git a/after/plugin/nvim-metals.vim b/after/plugin/nvim-metals.vim deleted file mode 100644 index b29809e..0000000 --- a/after/plugin/nvim-metals.vim +++ /dev/null @@ -1,2 +0,0 @@ -":let g:metals_server_version = '0.10.6-M1+29-22f5a4b1-SNAPSHOT' -"let g:metals_server_version = '0.10.6-M1' diff --git a/after/plugin/syntastic.vim b/after/plugin/syntastic.vim deleted file mode 100644 index 84e9de0..0000000 --- a/after/plugin/syntastic.vim +++ /dev/null @@ -1,7 +0,0 @@ - -hi SyntasticErrorLine ctermbg=52 ctermfg=fg cterm=NONE -hi SyntasticWarningLine ctermbg=234 ctermfg=fg cterm=NONE - -let g:syntastic_tex_chktex_showmsg = 0 -let g:syntastic_tex_chktex_args = '-n 1 -n 11' -let g:syntastic_tex_checkers = ['chktex'] diff --git a/after/plugin/tabline.vim b/after/plugin/tabline.vim deleted file mode 100644 index f3aa0b3..0000000 --- a/after/plugin/tabline.vim +++ /dev/null @@ -1,45 +0,0 @@ -function MyTabLine() - let s = '' - let t = tabpagenr() - let i = 1 - while i <= tabpagenr('$') - let buflist = tabpagebuflist(i) - let winnr = tabpagewinnr(i) - let s .= '%' . i . 'T' - let s .= (i == t ? '%2*' : '%1*') - let s .= ' ' - let s .= i . ':' - let s .= winnr . '/' . tabpagewinnr(i,'$') - - let bufnrlist = tabpagebuflist(i) - for bufnr in bufnrlist - if getbufvar(bufnr, "&modified") - let s .= '+' - break - endif - endfor - - let s .= ' %*' - let s .= (i == t ? '%#TabLineSel#' : '%#TabLine#') - let bufnr = buflist[winnr - 1] - let file = bufname(bufnr) - let buftype = getbufvar(bufnr, 'buftype') - if buftype == 'nofile' - if file =~ '\/.' - let file = substitute(file, '.*\/\ze.', '', '') - endif - else - let file = fnamemodify(file, ':p:t') - endif - if file == '' - let file = '[No Name]' - endif - let s .= file - let i = i + 1 - endwhile - let s .= '%T%#TabLineFill#%=' - let s .= (tabpagenr('$') > 1 ? '%999XX' : 'X') - return s -endfunction -set stal=2 -set tabline=%!MyTabLine() diff --git a/after/plugin/telescope.vim b/after/plugin/telescope.vim deleted file mode 100644 index 5243adb..0000000 --- a/after/plugin/telescope.vim +++ /dev/null @@ -1,3 +0,0 @@ - -" search for symbols -map gs :Telescope lsp_dynamic_workspace_symbols diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua new file mode 100644 index 0000000..7433b51 --- /dev/null +++ b/after/plugin/treesitter.lua @@ -0,0 +1,16 @@ +require("nvim-treesitter.configs").setup({ + ensure_installed = { "typescript" }, + sync_install = true, + auto_install = true, + highlight = { + enable = true, + -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- Instead of true it can also be a list of languages + additional_vim_regex_highlighting = false, + }, + indent = { + enable = true, + }, +}) diff --git a/after/plugin/trouble.lua b/after/plugin/trouble.lua new file mode 100644 index 0000000..584dfac --- /dev/null +++ b/after/plugin/trouble.lua @@ -0,0 +1,11 @@ +require("trouble").setup({ + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below +}) +vim.api.nvim_set_keymap("n", "xx", "Trouble", { silent = true, noremap = true }) +vim.api.nvim_set_keymap("n", "xw", "Trouble workspace_diagnostics", { silent = true, noremap = true }) +vim.api.nvim_set_keymap("n", "xd", "Trouble document_diagnostics", { silent = true, noremap = true }) +vim.api.nvim_set_keymap("n", "xl", "Trouble loclist", { silent = true, noremap = true }) +vim.api.nvim_set_keymap("n", "xq", "Trouble quickfix", { silent = true, noremap = true }) +vim.api.nvim_set_keymap("n", "gR", "Trouble lsp_references", { silent = true, noremap = true }) diff --git a/after/plugin/vimtex.vim b/after/plugin/vimtex.vim deleted file mode 100644 index d813c7a..0000000 --- a/after/plugin/vimtex.vim +++ /dev/null @@ -1,4 +0,0 @@ -let g:vimtex_quickfix_ignorefilters = [ - \ 'overfull', - \ 'underfull', - \] diff --git a/autoload/plug.vim b/autoload/plug.vim deleted file mode 100644 index 652caa8..0000000 --- a/autoload/plug.vim +++ /dev/null @@ -1,2812 +0,0 @@ -" vim-plug: Vim plugin manager -" ============================ -" -" Download plug.vim and put it in ~/.vim/autoload -" -" curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ -" https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim -" -" Edit your .vimrc -" -" call plug#begin('~/.vim/plugged') -" -" " Make sure you use single quotes -" -" " Shorthand notation; fetches https://github.com/junegunn/vim-easy-align -" Plug 'junegunn/vim-easy-align' -" -" " Any valid git URL is allowed -" Plug 'https://github.com/junegunn/vim-github-dashboard.git' -" -" " Multiple Plug commands can be written in a single line using | separators -" Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' -" -" " On-demand loading -" Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } -" Plug 'tpope/vim-fireplace', { 'for': 'clojure' } -" -" " Using a non-default branch -" Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' } -" -" " Using a tagged release; wildcard allowed (requires git 1.9.2 or above) -" Plug 'fatih/vim-go', { 'tag': '*' } -" -" " Plugin options -" Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' } -" -" " Plugin outside ~/.vim/plugged with post-update hook -" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } -" -" " Unmanaged plugin (manually installed and updated) -" Plug '~/my-prototype-plugin' -" -" " Initialize plugin system -" call plug#end() -" -" Then reload .vimrc and :PlugInstall to install plugins. -" -" Plug options: -" -"| Option | Description | -"| ----------------------- | ------------------------------------------------ | -"| `branch`/`tag`/`commit` | Branch/tag/commit of the repository to use | -"| `rtp` | Subdirectory that contains Vim plugin | -"| `dir` | Custom directory for the plugin | -"| `as` | Use different name for the plugin | -"| `do` | Post-update hook (string or funcref) | -"| `on` | On-demand loading: Commands or ``-mappings | -"| `for` | On-demand loading: File types | -"| `frozen` | Do not update unless explicitly specified | -" -" More information: https://github.com/junegunn/vim-plug -" -" -" Copyright (c) 2017 Junegunn Choi -" -" MIT License -" -" Permission is hereby granted, free of charge, to any person obtaining -" a copy of this software and associated documentation files (the -" "Software"), to deal in the Software without restriction, including -" without limitation the rights to use, copy, modify, merge, publish, -" distribute, sublicense, and/or sell copies of the Software, and to -" permit persons to whom the Software is furnished to do so, subject to -" the following conditions: -" -" The above copyright notice and this permission notice shall be -" included in all copies or substantial portions of the Software. -" -" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -" LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -if exists('g:loaded_plug') - finish -endif -let g:loaded_plug = 1 - -let s:cpo_save = &cpo -set cpo&vim - -let s:plug_src = 'https://github.com/junegunn/vim-plug.git' -let s:plug_tab = get(s:, 'plug_tab', -1) -let s:plug_buf = get(s:, 'plug_buf', -1) -let s:mac_gui = has('gui_macvim') && has('gui_running') -let s:is_win = has('win32') -let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win) -let s:vim8 = has('patch-8.0.0039') && exists('*job_start') -if s:is_win && &shellslash - set noshellslash - let s:me = resolve(expand(':p')) - set shellslash -else - let s:me = resolve(expand(':p')) -endif -let s:base_spec = { 'branch': '', 'frozen': 0 } -let s:TYPE = { -\ 'string': type(''), -\ 'list': type([]), -\ 'dict': type({}), -\ 'funcref': type(function('call')) -\ } -let s:loaded = get(s:, 'loaded', {}) -let s:triggers = get(s:, 'triggers', {}) - -function! s:is_powershell(shell) - return a:shell =~# 'powershell\(\.exe\)\?$' || a:shell =~# 'pwsh\(\.exe\)\?$' -endfunction - -function! s:isabsolute(dir) abort - return a:dir =~# '^/' || (has('win32') && a:dir =~? '^\%(\\\|[A-Z]:\)') -endfunction - -function! s:git_dir(dir) abort - let gitdir = s:trim(a:dir) . '/.git' - if isdirectory(gitdir) - return gitdir - endif - if !filereadable(gitdir) - return '' - endif - let gitdir = matchstr(get(readfile(gitdir), 0, ''), '^gitdir: \zs.*') - if len(gitdir) && !s:isabsolute(gitdir) - let gitdir = a:dir . '/' . gitdir - endif - return isdirectory(gitdir) ? gitdir : '' -endfunction - -function! s:git_origin_url(dir) abort - let gitdir = s:git_dir(a:dir) - let config = gitdir . '/config' - if empty(gitdir) || !filereadable(config) - return '' - endif - return matchstr(join(readfile(config)), '\[remote "origin"\].\{-}url\s*=\s*\zs\S*\ze') -endfunction - -function! s:git_revision(dir) abort - let gitdir = s:git_dir(a:dir) - let head = gitdir . '/HEAD' - if empty(gitdir) || !filereadable(head) - return '' - endif - - let line = get(readfile(head), 0, '') - let ref = matchstr(line, '^ref: \zs.*') - if empty(ref) - return line - endif - - if filereadable(gitdir . '/' . ref) - return get(readfile(gitdir . '/' . ref), 0, '') - endif - - if filereadable(gitdir . '/packed-refs') - for line in readfile(gitdir . '/packed-refs') - if line =~# ' ' . ref - return matchstr(line, '^[0-9a-f]*') - endif - endfor - endif - - return '' -endfunction - -function! s:git_local_branch(dir) abort - let gitdir = s:git_dir(a:dir) - let head = gitdir . '/HEAD' - if empty(gitdir) || !filereadable(head) - return '' - endif - let branch = matchstr(get(readfile(head), 0, ''), '^ref: refs/heads/\zs.*') - return len(branch) ? branch : 'HEAD' -endfunction - -function! s:git_origin_branch(spec) - if len(a:spec.branch) - return a:spec.branch - endif - - " The file may not be present if this is a local repository - let gitdir = s:git_dir(a:spec.dir) - let origin_head = gitdir.'/refs/remotes/origin/HEAD' - if len(gitdir) && filereadable(origin_head) - return matchstr(get(readfile(origin_head), 0, ''), - \ '^ref: refs/remotes/origin/\zs.*') - endif - - " The command may not return the name of a branch in detached HEAD state - let result = s:lines(s:system('git symbolic-ref --short HEAD', a:spec.dir)) - return v:shell_error ? '' : result[-1] -endfunction - -if s:is_win - function! s:plug_call(fn, ...) - let shellslash = &shellslash - try - set noshellslash - return call(a:fn, a:000) - finally - let &shellslash = shellslash - endtry - endfunction -else - function! s:plug_call(fn, ...) - return call(a:fn, a:000) - endfunction -endif - -function! s:plug_getcwd() - return s:plug_call('getcwd') -endfunction - -function! s:plug_fnamemodify(fname, mods) - return s:plug_call('fnamemodify', a:fname, a:mods) -endfunction - -function! s:plug_expand(fmt) - return s:plug_call('expand', a:fmt, 1) -endfunction - -function! s:plug_tempname() - return s:plug_call('tempname') -endfunction - -function! plug#begin(...) - if a:0 > 0 - let s:plug_home_org = a:1 - let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p')) - elseif exists('g:plug_home') - let home = s:path(g:plug_home) - elseif has('nvim') - let home = stdpath('data') . '/plugged' - elseif !empty(&rtp) - let home = s:path(split(&rtp, ',')[0]) . '/plugged' - else - return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.') - endif - if s:plug_fnamemodify(home, ':t') ==# 'plugin' && s:plug_fnamemodify(home, ':h') ==# s:first_rtp - return s:err('Invalid plug home. '.home.' is a standard Vim runtime path and is not allowed.') - endif - - let g:plug_home = home - let g:plugs = {} - let g:plugs_order = [] - let s:triggers = {} - - call s:define_commands() - return 1 -endfunction - -function! s:define_commands() - command! -nargs=+ -bar Plug call plug#() - if !executable('git') - return s:err('`git` executable not found. Most commands will not be available. To suppress this message, prepend `silent!` to `call plug#begin(...)`.') - endif - if has('win32') - \ && &shellslash - \ && (&shell =~# 'cmd\(\.exe\)\?$' || s:is_powershell(&shell)) - return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.') - endif - if !has('nvim') - \ && (has('win32') || has('win32unix')) - \ && !has('multi_byte') - return s:err('Vim needs +multi_byte feature on Windows to run shell commands. Enable +iconv for best results.') - endif - command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install(0, []) - command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update(0, []) - command! -nargs=0 -bar -bang PlugClean call s:clean(0) - command! -nargs=0 -bar PlugUpgrade if s:upgrade() | execute 'source' s:esc(s:me) | endif - command! -nargs=0 -bar PlugStatus call s:status() - command! -nargs=0 -bar PlugDiff call s:diff() - command! -nargs=? -bar -bang -complete=file PlugSnapshot call s:snapshot(0, ) -endfunction - -function! s:to_a(v) - return type(a:v) == s:TYPE.list ? a:v : [a:v] -endfunction - -function! s:to_s(v) - return type(a:v) == s:TYPE.string ? a:v : join(a:v, "\n") . "\n" -endfunction - -function! s:glob(from, pattern) - return s:lines(globpath(a:from, a:pattern)) -endfunction - -function! s:source(from, ...) - let found = 0 - for pattern in a:000 - for vim in s:glob(a:from, pattern) - execute 'source' s:esc(vim) - let found = 1 - endfor - endfor - return found -endfunction - -function! s:assoc(dict, key, val) - let a:dict[a:key] = add(get(a:dict, a:key, []), a:val) -endfunction - -function! s:ask(message, ...) - call inputsave() - echohl WarningMsg - let answer = input(a:message.(a:0 ? ' (y/N/a) ' : ' (y/N) ')) - echohl None - call inputrestore() - echo "\r" - return (a:0 && answer =~? '^a') ? 2 : (answer =~? '^y') ? 1 : 0 -endfunction - -function! s:ask_no_interrupt(...) - try - return call('s:ask', a:000) - catch - return 0 - endtry -endfunction - -function! s:lazy(plug, opt) - return has_key(a:plug, a:opt) && - \ (empty(s:to_a(a:plug[a:opt])) || - \ !isdirectory(a:plug.dir) || - \ len(s:glob(s:rtp(a:plug), 'plugin')) || - \ len(s:glob(s:rtp(a:plug), 'after/plugin'))) -endfunction - -function! plug#end() - if !exists('g:plugs') - return s:err('plug#end() called without calling plug#begin() first') - endif - - if exists('#PlugLOD') - augroup PlugLOD - autocmd! - augroup END - augroup! PlugLOD - endif - let lod = { 'ft': {}, 'map': {}, 'cmd': {} } - - if get(g:, 'did_load_filetypes', 0) - filetype off - endif - for name in g:plugs_order - if !has_key(g:plugs, name) - continue - endif - let plug = g:plugs[name] - if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for') - let s:loaded[name] = 1 - continue - endif - - if has_key(plug, 'on') - let s:triggers[name] = { 'map': [], 'cmd': [] } - for cmd in s:to_a(plug.on) - if cmd =~? '^.\+' - if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i')) - call s:assoc(lod.map, cmd, name) - endif - call add(s:triggers[name].map, cmd) - elseif cmd =~# '^[A-Z]' - let cmd = substitute(cmd, '!*$', '', '') - if exists(':'.cmd) != 2 - call s:assoc(lod.cmd, cmd, name) - endif - call add(s:triggers[name].cmd, cmd) - else - call s:err('Invalid `on` option: '.cmd. - \ '. Should start with an uppercase letter or ``.') - endif - endfor - endif - - if has_key(plug, 'for') - let types = s:to_a(plug.for) - if !empty(types) - augroup filetypedetect - call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim') - augroup END - endif - for type in types - call s:assoc(lod.ft, type, name) - endfor - endif - endfor - - for [cmd, names] in items(lod.cmd) - execute printf( - \ 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "", , , , %s)', - \ cmd, string(cmd), string(names)) - endfor - - for [map, names] in items(lod.map) - for [mode, map_prefix, key_prefix] in - \ [['i', '', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] - execute printf( - \ '%snoremap %s %s:call lod_map(%s, %s, %s, "%s")', - \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix) - endfor - endfor - - for [ft, names] in items(lod.ft) - augroup PlugLOD - execute printf('autocmd FileType %s call lod_ft(%s, %s)', - \ ft, string(ft), string(names)) - augroup END - endfor - - call s:reorg_rtp() - filetype plugin indent on - if has('vim_starting') - if has('syntax') && !exists('g:syntax_on') - syntax enable - end - else - call s:reload_plugins() - endif -endfunction - -function! s:loaded_names() - return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)') -endfunction - -function! s:load_plugin(spec) - call s:source(s:rtp(a:spec), 'plugin/**/*.vim', 'after/plugin/**/*.vim') -endfunction - -function! s:reload_plugins() - for name in s:loaded_names() - call s:load_plugin(g:plugs[name]) - endfor -endfunction - -function! s:trim(str) - return substitute(a:str, '[\/]\+$', '', '') -endfunction - -function! s:version_requirement(val, min) - for idx in range(0, len(a:min) - 1) - let v = get(a:val, idx, 0) - if v < a:min[idx] | return 0 - elseif v > a:min[idx] | return 1 - endif - endfor - return 1 -endfunction - -function! s:git_version_requirement(...) - if !exists('s:git_version') - let s:git_version = map(split(split(s:system(['git', '--version']))[2], '\.'), 'str2nr(v:val)') - endif - return s:version_requirement(s:git_version, a:000) -endfunction - -function! s:progress_opt(base) - return a:base && !s:is_win && - \ s:git_version_requirement(1, 7, 1) ? '--progress' : '' -endfunction - -function! s:rtp(spec) - return s:path(a:spec.dir . get(a:spec, 'rtp', '')) -endfunction - -if s:is_win - function! s:path(path) - return s:trim(substitute(a:path, '/', '\', 'g')) - endfunction - - function! s:dirpath(path) - return s:path(a:path) . '\' - endfunction - - function! s:is_local_plug(repo) - return a:repo =~? '^[a-z]:\|^[%~]' - endfunction - - " Copied from fzf - function! s:wrap_cmds(cmds) - let cmds = [ - \ '@echo off', - \ 'setlocal enabledelayedexpansion'] - \ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) - \ + ['endlocal'] - if has('iconv') - if !exists('s:codepage') - let s:codepage = libcallnr('kernel32.dll', 'GetACP', 0) - endif - return map(cmds, printf('iconv(v:val."\r", "%s", "cp%d")', &encoding, s:codepage)) - endif - return map(cmds, 'v:val."\r"') - endfunction - - function! s:batchfile(cmd) - let batchfile = s:plug_tempname().'.bat' - call writefile(s:wrap_cmds(a:cmd), batchfile) - let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0}) - if s:is_powershell(&shell) - let cmd = '& ' . cmd - endif - return [batchfile, cmd] - endfunction -else - function! s:path(path) - return s:trim(a:path) - endfunction - - function! s:dirpath(path) - return substitute(a:path, '[/\\]*$', '/', '') - endfunction - - function! s:is_local_plug(repo) - return a:repo[0] =~ '[/$~]' - endfunction -endif - -function! s:err(msg) - echohl ErrorMsg - echom '[vim-plug] '.a:msg - echohl None -endfunction - -function! s:warn(cmd, msg) - echohl WarningMsg - execute a:cmd 'a:msg' - echohl None -endfunction - -function! s:esc(path) - return escape(a:path, ' ') -endfunction - -function! s:escrtp(path) - return escape(a:path, ' ,') -endfunction - -function! s:remove_rtp() - for name in s:loaded_names() - let rtp = s:rtp(g:plugs[name]) - execute 'set rtp-='.s:escrtp(rtp) - let after = globpath(rtp, 'after') - if isdirectory(after) - execute 'set rtp-='.s:escrtp(after) - endif - endfor -endfunction - -function! s:reorg_rtp() - if !empty(s:first_rtp) - execute 'set rtp-='.s:first_rtp - execute 'set rtp-='.s:last_rtp - endif - - " &rtp is modified from outside - if exists('s:prtp') && s:prtp !=# &rtp - call s:remove_rtp() - unlet! s:middle - endif - - let s:middle = get(s:, 'middle', &rtp) - let rtps = map(s:loaded_names(), 's:rtp(g:plugs[v:val])') - let afters = filter(map(copy(rtps), 'globpath(v:val, "after")'), '!empty(v:val)') - let rtp = join(map(rtps, 'escape(v:val, ",")'), ',') - \ . ','.s:middle.',' - \ . join(map(afters, 'escape(v:val, ",")'), ',') - let &rtp = substitute(substitute(rtp, ',,*', ',', 'g'), '^,\|,$', '', 'g') - let s:prtp = &rtp - - if !empty(s:first_rtp) - execute 'set rtp^='.s:first_rtp - execute 'set rtp+='.s:last_rtp - endif -endfunction - -function! s:doautocmd(...) - if exists('#'.join(a:000, '#')) - execute 'doautocmd' ((v:version > 703 || has('patch442')) ? '' : '') join(a:000) - endif -endfunction - -function! s:dobufread(names) - for name in a:names - let path = s:rtp(g:plugs[name]) - for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin'] - if len(finddir(dir, path)) - if exists('#BufRead') - doautocmd BufRead - endif - return - endif - endfor - endfor -endfunction - -function! plug#load(...) - if a:0 == 0 - return s:err('Argument missing: plugin name(s) required') - endif - if !exists('g:plugs') - return s:err('plug#begin was not called') - endif - let names = a:0 == 1 && type(a:1) == s:TYPE.list ? a:1 : a:000 - let unknowns = filter(copy(names), '!has_key(g:plugs, v:val)') - if !empty(unknowns) - let s = len(unknowns) > 1 ? 's' : '' - return s:err(printf('Unknown plugin%s: %s', s, join(unknowns, ', '))) - end - let unloaded = filter(copy(names), '!get(s:loaded, v:val, 0)') - if !empty(unloaded) - for name in unloaded - call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - endfor - call s:dobufread(unloaded) - return 1 - end - return 0 -endfunction - -function! s:remove_triggers(name) - if !has_key(s:triggers, a:name) - return - endif - for cmd in s:triggers[a:name].cmd - execute 'silent! delc' cmd - endfor - for map in s:triggers[a:name].map - execute 'silent! unmap' map - execute 'silent! iunmap' map - endfor - call remove(s:triggers, a:name) -endfunction - -function! s:lod(names, types, ...) - for name in a:names - call s:remove_triggers(name) - let s:loaded[name] = 1 - endfor - call s:reorg_rtp() - - for name in a:names - let rtp = s:rtp(g:plugs[name]) - for dir in a:types - call s:source(rtp, dir.'/**/*.vim') - endfor - if a:0 - if !s:source(rtp, a:1) && !empty(s:glob(rtp, a:2)) - execute 'runtime' a:1 - endif - call s:source(rtp, a:2) - endif - call s:doautocmd('User', name) - endfor -endfunction - -function! s:lod_ft(pat, names) - let syn = 'syntax/'.a:pat.'.vim' - call s:lod(a:names, ['plugin', 'after/plugin'], syn, 'after/'.syn) - execute 'autocmd! PlugLOD FileType' a:pat - call s:doautocmd('filetypeplugin', 'FileType') - call s:doautocmd('filetypeindent', 'FileType') -endfunction - -function! s:lod_cmd(cmd, bang, l1, l2, args, names) - call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - call s:dobufread(a:names) - execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args) -endfunction - -function! s:lod_map(map, names, with_prefix, prefix) - call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - call s:dobufread(a:names) - let extra = '' - while 1 - let c = getchar(0) - if c == 0 - break - endif - let extra .= nr2char(c) - endwhile - - if a:with_prefix - let prefix = v:count ? v:count : '' - let prefix .= '"'.v:register.a:prefix - if mode(1) == 'no' - if v:operator == 'c' - let prefix = "\" . prefix - endif - let prefix .= v:operator - endif - call feedkeys(prefix, 'n') - endif - call feedkeys(substitute(a:map, '^', "\", '') . extra) -endfunction - -function! plug#(repo, ...) - if a:0 > 1 - return s:err('Invalid number of arguments (1..2)') - endif - - try - let repo = s:trim(a:repo) - let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec - let name = get(opts, 'as', s:plug_fnamemodify(repo, ':t:s?\.git$??')) - let spec = extend(s:infer_properties(name, repo), opts) - if !has_key(g:plugs, name) - call add(g:plugs_order, name) - endif - let g:plugs[name] = spec - let s:loaded[name] = get(s:loaded, name, 0) - catch - return s:err(repo . ' ' . v:exception) - endtry -endfunction - -function! s:parse_options(arg) - let opts = copy(s:base_spec) - let type = type(a:arg) - let opt_errfmt = 'Invalid argument for "%s" option of :Plug (expected: %s)' - if type == s:TYPE.string - if empty(a:arg) - throw printf(opt_errfmt, 'tag', 'string') - endif - let opts.tag = a:arg - elseif type == s:TYPE.dict - for opt in ['branch', 'tag', 'commit', 'rtp', 'dir', 'as'] - if has_key(a:arg, opt) - \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt])) - throw printf(opt_errfmt, opt, 'string') - endif - endfor - for opt in ['on', 'for'] - if has_key(a:arg, opt) - \ && type(a:arg[opt]) != s:TYPE.list - \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt])) - throw printf(opt_errfmt, opt, 'string or list') - endif - endfor - if has_key(a:arg, 'do') - \ && type(a:arg.do) != s:TYPE.funcref - \ && (type(a:arg.do) != s:TYPE.string || empty(a:arg.do)) - throw printf(opt_errfmt, 'do', 'string or funcref') - endif - call extend(opts, a:arg) - if has_key(opts, 'dir') - let opts.dir = s:dirpath(s:plug_expand(opts.dir)) - endif - else - throw 'Invalid argument type (expected: string or dictionary)' - endif - return opts -endfunction - -function! s:infer_properties(name, repo) - let repo = a:repo - if s:is_local_plug(repo) - return { 'dir': s:dirpath(s:plug_expand(repo)) } - else - if repo =~ ':' - let uri = repo - else - if repo !~ '/' - throw printf('Invalid argument: %s (implicit `vim-scripts'' expansion is deprecated)', repo) - endif - let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git') - let uri = printf(fmt, repo) - endif - return { 'dir': s:dirpath(g:plug_home.'/'.a:name), 'uri': uri } - endif -endfunction - -function! s:install(force, names) - call s:update_impl(0, a:force, a:names) -endfunction - -function! s:update(force, names) - call s:update_impl(1, a:force, a:names) -endfunction - -function! plug#helptags() - if !exists('g:plugs') - return s:err('plug#begin was not called') - endif - for spec in values(g:plugs) - let docd = join([s:rtp(spec), 'doc'], '/') - if isdirectory(docd) - silent! execute 'helptags' s:esc(docd) - endif - endfor - return 1 -endfunction - -function! s:syntax() - syntax clear - syntax region plug1 start=/\%1l/ end=/\%2l/ contains=plugNumber - syntax region plug2 start=/\%2l/ end=/\%3l/ contains=plugBracket,plugX - syn match plugNumber /[0-9]\+[0-9.]*/ contained - syn match plugBracket /[[\]]/ contained - syn match plugX /x/ contained - syn match plugDash /^-\{1}\ / - syn match plugPlus /^+/ - syn match plugStar /^*/ - syn match plugMessage /\(^- \)\@<=.*/ - syn match plugName /\(^- \)\@<=[^ ]*:/ - syn match plugSha /\%(: \)\@<=[0-9a-f]\{4,}$/ - syn match plugTag /(tag: [^)]\+)/ - syn match plugInstall /\(^+ \)\@<=[^:]*/ - syn match plugUpdate /\(^* \)\@<=[^:]*/ - syn match plugCommit /^ \X*[0-9a-f]\{7,9} .*/ contains=plugRelDate,plugEdge,plugTag - syn match plugEdge /^ \X\+$/ - syn match plugEdge /^ \X*/ contained nextgroup=plugSha - syn match plugSha /[0-9a-f]\{7,9}/ contained - syn match plugRelDate /([^)]*)$/ contained - syn match plugNotLoaded /(not loaded)$/ - syn match plugError /^x.*/ - syn region plugDeleted start=/^\~ .*/ end=/^\ze\S/ - syn match plugH2 /^.*:\n-\+$/ - syn match plugH2 /^-\{2,}/ - syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean - hi def link plug1 Title - hi def link plug2 Repeat - hi def link plugH2 Type - hi def link plugX Exception - hi def link plugBracket Structure - hi def link plugNumber Number - - hi def link plugDash Special - hi def link plugPlus Constant - hi def link plugStar Boolean - - hi def link plugMessage Function - hi def link plugName Label - hi def link plugInstall Function - hi def link plugUpdate Type - - hi def link plugError Error - hi def link plugDeleted Ignore - hi def link plugRelDate Comment - hi def link plugEdge PreProc - hi def link plugSha Identifier - hi def link plugTag Constant - - hi def link plugNotLoaded Comment -endfunction - -function! s:lpad(str, len) - return a:str . repeat(' ', a:len - len(a:str)) -endfunction - -function! s:lines(msg) - return split(a:msg, "[\r\n]") -endfunction - -function! s:lastline(msg) - return get(s:lines(a:msg), -1, '') -endfunction - -function! s:new_window() - execute get(g:, 'plug_window', 'vertical topleft new') -endfunction - -function! s:plug_window_exists() - let buflist = tabpagebuflist(s:plug_tab) - return !empty(buflist) && index(buflist, s:plug_buf) >= 0 -endfunction - -function! s:switch_in() - if !s:plug_window_exists() - return 0 - endif - - if winbufnr(0) != s:plug_buf - let s:pos = [tabpagenr(), winnr(), winsaveview()] - execute 'normal!' s:plug_tab.'gt' - let winnr = bufwinnr(s:plug_buf) - execute winnr.'wincmd w' - call add(s:pos, winsaveview()) - else - let s:pos = [winsaveview()] - endif - - setlocal modifiable - return 1 -endfunction - -function! s:switch_out(...) - call winrestview(s:pos[-1]) - setlocal nomodifiable - if a:0 > 0 - execute a:1 - endif - - if len(s:pos) > 1 - execute 'normal!' s:pos[0].'gt' - execute s:pos[1] 'wincmd w' - call winrestview(s:pos[2]) - endif -endfunction - -function! s:finish_bindings() - nnoremap R :call retry() - nnoremap D :PlugDiff - nnoremap S :PlugStatus - nnoremap U :call status_update() - xnoremap U :call status_update() - nnoremap ]] :silent! call section('') - nnoremap [[ :silent! call section('b') -endfunction - -function! s:prepare(...) - if empty(s:plug_getcwd()) - throw 'Invalid current working directory. Cannot proceed.' - endif - - for evar in ['$GIT_DIR', '$GIT_WORK_TREE'] - if exists(evar) - throw evar.' detected. Cannot proceed.' - endif - endfor - - call s:job_abort() - if s:switch_in() - if b:plug_preview == 1 - pc - endif - enew - else - call s:new_window() - endif - - nnoremap q :call close_pane() - if a:0 == 0 - call s:finish_bindings() - endif - let b:plug_preview = -1 - let s:plug_tab = tabpagenr() - let s:plug_buf = winbufnr(0) - call s:assign_name() - - for k in ['', 'L', 'o', 'X', 'd', 'dd'] - execute 'silent! unmap ' k - endfor - setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell - if exists('+colorcolumn') - setlocal colorcolumn= - endif - setf vim-plug - if exists('g:syntax_on') - call s:syntax() - endif -endfunction - -function! s:close_pane() - if b:plug_preview == 1 - pc - let b:plug_preview = -1 - else - bd - endif -endfunction - -function! s:assign_name() - " Assign buffer name - let prefix = '[Plugins]' - let name = prefix - let idx = 2 - while bufexists(name) - let name = printf('%s (%s)', prefix, idx) - let idx = idx + 1 - endwhile - silent! execute 'f' fnameescape(name) -endfunction - -function! s:chsh(swap) - let prev = [&shell, &shellcmdflag, &shellredir] - if !s:is_win - set shell=sh - endif - if a:swap - if s:is_powershell(&shell) - let &shellredir = '2>&1 | Out-File -Encoding UTF8 %s' - elseif &shell =~# 'sh' || &shell =~# 'cmd\(\.exe\)\?$' - set shellredir=>%s\ 2>&1 - endif - endif - return prev -endfunction - -function! s:bang(cmd, ...) - let batchfile = '' - try - let [sh, shellcmdflag, shrd] = s:chsh(a:0) - " FIXME: Escaping is incomplete. We could use shellescape with eval, - " but it won't work on Windows. - let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd - if s:is_win - let [batchfile, cmd] = s:batchfile(cmd) - endif - let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%') - execute "normal! :execute g:_plug_bang\\" - finally - unlet g:_plug_bang - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) - call delete(batchfile) - endif - endtry - return v:shell_error ? 'Exit status: ' . v:shell_error : '' -endfunction - -function! s:regress_bar() - let bar = substitute(getline(2)[1:-2], '.*\zs=', 'x', '') - call s:progress_bar(2, bar, len(bar)) -endfunction - -function! s:is_updated(dir) - return !empty(s:system_chomp(['git', 'log', '--pretty=format:%h', 'HEAD...HEAD@{1}'], a:dir)) -endfunction - -function! s:do(pull, force, todo) - for [name, spec] in items(a:todo) - if !isdirectory(spec.dir) - continue - endif - let installed = has_key(s:update.new, name) - let updated = installed ? 0 : - \ (a:pull && index(s:update.errors, name) < 0 && s:is_updated(spec.dir)) - if a:force || installed || updated - execute 'cd' s:esc(spec.dir) - call append(3, '- Post-update hook for '. name .' ... ') - let error = '' - let type = type(spec.do) - if type == s:TYPE.string - if spec.do[0] == ':' - if !get(s:loaded, name, 0) - let s:loaded[name] = 1 - call s:reorg_rtp() - endif - call s:load_plugin(spec) - try - execute spec.do[1:] - catch - let error = v:exception - endtry - if !s:plug_window_exists() - cd - - throw 'Warning: vim-plug was terminated by the post-update hook of '.name - endif - else - let error = s:bang(spec.do) - endif - elseif type == s:TYPE.funcref - try - call s:load_plugin(spec) - let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged') - call spec.do({ 'name': name, 'status': status, 'force': a:force }) - catch - let error = v:exception - endtry - else - let error = 'Invalid hook type' - endif - call s:switch_in() - call setline(4, empty(error) ? (getline(4) . 'OK') - \ : ('x' . getline(4)[1:] . error)) - if !empty(error) - call add(s:update.errors, name) - call s:regress_bar() - endif - cd - - endif - endfor -endfunction - -function! s:hash_match(a, b) - return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0 -endfunction - -function! s:checkout(spec) - let sha = a:spec.commit - let output = s:git_revision(a:spec.dir) - if !empty(output) && !s:hash_match(sha, s:lines(output)[0]) - let credential_helper = s:git_version_requirement(2) ? '-c credential.helper= ' : '' - let output = s:system( - \ 'git '.credential_helper.'fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir) - endif - return output -endfunction - -function! s:finish(pull) - let new_frozen = len(filter(keys(s:update.new), 'g:plugs[v:val].frozen')) - if new_frozen - let s = new_frozen > 1 ? 's' : '' - call append(3, printf('- Installed %d frozen plugin%s', new_frozen, s)) - endif - call append(3, '- Finishing ... ') | 4 - redraw - call plug#helptags() - call plug#end() - call setline(4, getline(4) . 'Done!') - redraw - let msgs = [] - if !empty(s:update.errors) - call add(msgs, "Press 'R' to retry.") - endif - if a:pull && len(s:update.new) < len(filter(getline(5, '$'), - \ "v:val =~ '^- ' && v:val !~# 'Already up.to.date'")) - call add(msgs, "Press 'D' to see the updated changes.") - endif - echo join(msgs, ' ') - call s:finish_bindings() -endfunction - -function! s:retry() - if empty(s:update.errors) - return - endif - echo - call s:update_impl(s:update.pull, s:update.force, - \ extend(copy(s:update.errors), [s:update.threads])) -endfunction - -function! s:is_managed(name) - return has_key(g:plugs[a:name], 'uri') -endfunction - -function! s:names(...) - return sort(filter(keys(g:plugs), 'stridx(v:val, a:1) == 0 && s:is_managed(v:val)')) -endfunction - -function! s:check_ruby() - silent! ruby require 'thread'; VIM::command("let g:plug_ruby = '#{RUBY_VERSION}'") - if !exists('g:plug_ruby') - redraw! - return s:warn('echom', 'Warning: Ruby interface is broken') - endif - let ruby_version = split(g:plug_ruby, '\.') - unlet g:plug_ruby - return s:version_requirement(ruby_version, [1, 8, 7]) -endfunction - -function! s:update_impl(pull, force, args) abort - let sync = index(a:args, '--sync') >= 0 || has('vim_starting') - let args = filter(copy(a:args), 'v:val != "--sync"') - let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ? - \ remove(args, -1) : get(g:, 'plug_threads', 16) - - let managed = filter(copy(g:plugs), 's:is_managed(v:key)') - let todo = empty(args) ? filter(managed, '!v:val.frozen || !isdirectory(v:val.dir)') : - \ filter(managed, 'index(args, v:key) >= 0') - - if empty(todo) - return s:warn('echo', 'No plugin to '. (a:pull ? 'update' : 'install')) - endif - - if !s:is_win && s:git_version_requirement(2, 3) - let s:git_terminal_prompt = exists('$GIT_TERMINAL_PROMPT') ? $GIT_TERMINAL_PROMPT : '' - let $GIT_TERMINAL_PROMPT = 0 - for plug in values(todo) - let plug.uri = substitute(plug.uri, - \ '^https://git::@github\.com', 'https://github.com', '') - endfor - endif - - if !isdirectory(g:plug_home) - try - call mkdir(g:plug_home, 'p') - catch - return s:err(printf('Invalid plug directory: %s. '. - \ 'Try to call plug#begin with a valid directory', g:plug_home)) - endtry - endif - - if has('nvim') && !exists('*jobwait') && threads > 1 - call s:warn('echom', '[vim-plug] Update Neovim for parallel installer') - endif - - let use_job = s:nvim || s:vim8 - let python = (has('python') || has('python3')) && !use_job - let ruby = has('ruby') && !use_job && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running')) && threads > 1 && s:check_ruby() - - let s:update = { - \ 'start': reltime(), - \ 'all': todo, - \ 'todo': copy(todo), - \ 'errors': [], - \ 'pull': a:pull, - \ 'force': a:force, - \ 'new': {}, - \ 'threads': (python || ruby || use_job) ? min([len(todo), threads]) : 1, - \ 'bar': '', - \ 'fin': 0 - \ } - - call s:prepare(1) - call append(0, ['', '']) - normal! 2G - silent! redraw - - " Set remote name, overriding a possible user git config's clone.defaultRemoteName - let s:clone_opt = ['--origin', 'origin'] - if get(g:, 'plug_shallow', 1) - call extend(s:clone_opt, ['--depth', '1']) - if s:git_version_requirement(1, 7, 10) - call add(s:clone_opt, '--no-single-branch') - endif - endif - - if has('win32unix') || has('wsl') - call extend(s:clone_opt, ['-c', 'core.eol=lf', '-c', 'core.autocrlf=input']) - endif - - let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : '' - - " Python version requirement (>= 2.7) - if python && !has('python3') && !ruby && !use_job && s:update.threads > 1 - redir => pyv - silent python import platform; print platform.python_version() - redir END - let python = s:version_requirement( - \ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 6]) - endif - - if (python || ruby) && s:update.threads > 1 - try - let imd = &imd - if s:mac_gui - set noimd - endif - if ruby - call s:update_ruby() - else - call s:update_python() - endif - catch - let lines = getline(4, '$') - let printed = {} - silent! 4,$d _ - for line in lines - let name = s:extract_name(line, '.', '') - if empty(name) || !has_key(printed, name) - call append('$', line) - if !empty(name) - let printed[name] = 1 - if line[0] == 'x' && index(s:update.errors, name) < 0 - call add(s:update.errors, name) - end - endif - endif - endfor - finally - let &imd = imd - call s:update_finish() - endtry - else - call s:update_vim() - while use_job && sync - sleep 100m - if s:update.fin - break - endif - endwhile - endif -endfunction - -function! s:log4(name, msg) - call setline(4, printf('- %s (%s)', a:msg, a:name)) - redraw -endfunction - -function! s:update_finish() - if exists('s:git_terminal_prompt') - let $GIT_TERMINAL_PROMPT = s:git_terminal_prompt - endif - if s:switch_in() - call append(3, '- Updating ...') | 4 - for [name, spec] in items(filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && (s:update.force || s:update.pull || has_key(s:update.new, v:key))')) - let [pos, _] = s:logpos(name) - if !pos - continue - endif - if has_key(spec, 'commit') - call s:log4(name, 'Checking out '.spec.commit) - let out = s:checkout(spec) - elseif has_key(spec, 'tag') - let tag = spec.tag - if tag =~ '\*' - let tags = s:lines(s:system('git tag --list '.plug#shellescape(tag).' --sort -version:refname 2>&1', spec.dir)) - if !v:shell_error && !empty(tags) - let tag = tags[0] - call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag)) - call append(3, '') - endif - endif - call s:log4(name, 'Checking out '.tag) - let out = s:system('git checkout -q '.plug#shellescape(tag).' -- 2>&1', spec.dir) - else - let branch = s:git_origin_branch(spec) - call s:log4(name, 'Merging origin/'.s:esc(branch)) - let out = s:system('git checkout -q '.plug#shellescape(branch).' -- 2>&1' - \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only '.plug#shellescape('origin/'.branch).' 2>&1')), spec.dir) - endif - if !v:shell_error && filereadable(spec.dir.'/.gitmodules') && - \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir)) - call s:log4(name, 'Updating submodules. This may take a while.') - let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir) - endif - let msg = s:format_message(v:shell_error ? 'x': '-', name, out) - if v:shell_error - call add(s:update.errors, name) - call s:regress_bar() - silent execute pos 'd _' - call append(4, msg) | 4 - elseif !empty(out) - call setline(pos, msg[0]) - endif - redraw - endfor - silent 4 d _ - try - call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && has_key(v:val, "do")')) - catch - call s:warn('echom', v:exception) - call s:warn('echo', '') - return - endtry - call s:finish(s:update.pull) - call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(s:update.start)))[0] . ' sec.') - call s:switch_out('normal! gg') - endif -endfunction - -function! s:job_abort() - if (!s:nvim && !s:vim8) || !exists('s:jobs') - return - endif - - for [name, j] in items(s:jobs) - if s:nvim - silent! call jobstop(j.jobid) - elseif s:vim8 - silent! call job_stop(j.jobid) - endif - if j.new - call s:rm_rf(g:plugs[name].dir) - endif - endfor - let s:jobs = {} -endfunction - -function! s:last_non_empty_line(lines) - let len = len(a:lines) - for idx in range(len) - let line = a:lines[len-idx-1] - if !empty(line) - return line - endif - endfor - return '' -endfunction - -function! s:job_out_cb(self, data) abort - let self = a:self - let data = remove(self.lines, -1) . a:data - let lines = map(split(data, "\n", 1), 'split(v:val, "\r", 1)[-1]') - call extend(self.lines, lines) - " To reduce the number of buffer updates - let self.tick = get(self, 'tick', -1) + 1 - if !self.running || self.tick % len(s:jobs) == 0 - let bullet = self.running ? (self.new ? '+' : '*') : (self.error ? 'x' : '-') - let result = self.error ? join(self.lines, "\n") : s:last_non_empty_line(self.lines) - call s:log(bullet, self.name, result) - endif -endfunction - -function! s:job_exit_cb(self, data) abort - let a:self.running = 0 - let a:self.error = a:data != 0 - call s:reap(a:self.name) - call s:tick() -endfunction - -function! s:job_cb(fn, job, ch, data) - if !s:plug_window_exists() " plug window closed - return s:job_abort() - endif - call call(a:fn, [a:job, a:data]) -endfunction - -function! s:nvim_cb(job_id, data, event) dict abort - return (a:event == 'stdout' || a:event == 'stderr') ? - \ s:job_cb('s:job_out_cb', self, 0, join(a:data, "\n")) : - \ s:job_cb('s:job_exit_cb', self, 0, a:data) -endfunction - -function! s:spawn(name, cmd, opts) - let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''], - \ 'new': get(a:opts, 'new', 0) } - let s:jobs[a:name] = job - - if s:nvim - if has_key(a:opts, 'dir') - let job.cwd = a:opts.dir - endif - let argv = a:cmd - call extend(job, { - \ 'on_stdout': function('s:nvim_cb'), - \ 'on_stderr': function('s:nvim_cb'), - \ 'on_exit': function('s:nvim_cb'), - \ }) - let jid = s:plug_call('jobstart', argv, job) - if jid > 0 - let job.jobid = jid - else - let job.running = 0 - let job.error = 1 - let job.lines = [jid < 0 ? argv[0].' is not executable' : - \ 'Invalid arguments (or job table is full)'] - endif - elseif s:vim8 - let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"script": 0})')) - if has_key(a:opts, 'dir') - let cmd = s:with_cd(cmd, a:opts.dir, 0) - endif - let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd] - let jid = job_start(s:is_win ? join(argv, ' ') : argv, { - \ 'out_cb': function('s:job_cb', ['s:job_out_cb', job]), - \ 'err_cb': function('s:job_cb', ['s:job_out_cb', job]), - \ 'exit_cb': function('s:job_cb', ['s:job_exit_cb', job]), - \ 'err_mode': 'raw', - \ 'out_mode': 'raw' - \}) - if job_status(jid) == 'run' - let job.jobid = jid - else - let job.running = 0 - let job.error = 1 - let job.lines = ['Failed to start job'] - endif - else - let job.lines = s:lines(call('s:system', has_key(a:opts, 'dir') ? [a:cmd, a:opts.dir] : [a:cmd])) - let job.error = v:shell_error != 0 - let job.running = 0 - endif -endfunction - -function! s:reap(name) - let job = s:jobs[a:name] - if job.error - call add(s:update.errors, a:name) - elseif get(job, 'new', 0) - let s:update.new[a:name] = 1 - endif - let s:update.bar .= job.error ? 'x' : '=' - - let bullet = job.error ? 'x' : '-' - let result = job.error ? join(job.lines, "\n") : s:last_non_empty_line(job.lines) - call s:log(bullet, a:name, empty(result) ? 'OK' : result) - call s:bar() - - call remove(s:jobs, a:name) -endfunction - -function! s:bar() - if s:switch_in() - let total = len(s:update.all) - call setline(1, (s:update.pull ? 'Updating' : 'Installing'). - \ ' plugins ('.len(s:update.bar).'/'.total.')') - call s:progress_bar(2, s:update.bar, total) - call s:switch_out() - endif -endfunction - -function! s:logpos(name) - let max = line('$') - for i in range(4, max > 4 ? max : 4) - if getline(i) =~# '^[-+x*] '.a:name.':' - for j in range(i + 1, max > 5 ? max : 5) - if getline(j) !~ '^ ' - return [i, j - 1] - endif - endfor - return [i, i] - endif - endfor - return [0, 0] -endfunction - -function! s:log(bullet, name, lines) - if s:switch_in() - let [b, e] = s:logpos(a:name) - if b > 0 - silent execute printf('%d,%d d _', b, e) - if b > winheight('.') - let b = 4 - endif - else - let b = 4 - endif - " FIXME For some reason, nomodifiable is set after :d in vim8 - setlocal modifiable - call append(b - 1, s:format_message(a:bullet, a:name, a:lines)) - call s:switch_out() - endif -endfunction - -function! s:update_vim() - let s:jobs = {} - - call s:bar() - call s:tick() -endfunction - -function! s:tick() - let pull = s:update.pull - let prog = s:progress_opt(s:nvim || s:vim8) -while 1 " Without TCO, Vim stack is bound to explode - if empty(s:update.todo) - if empty(s:jobs) && !s:update.fin - call s:update_finish() - let s:update.fin = 1 - endif - return - endif - - let name = keys(s:update.todo)[0] - let spec = remove(s:update.todo, name) - let new = empty(globpath(spec.dir, '.git', 1)) - - call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...') - redraw - - let has_tag = has_key(spec, 'tag') - if !new - let [error, _] = s:git_validate(spec, 0) - if empty(error) - if pull - let cmd = s:git_version_requirement(2) ? ['git', '-c', 'credential.helper=', 'fetch'] : ['git', 'fetch'] - if has_tag && !empty(globpath(spec.dir, '.git/shallow')) - call extend(cmd, ['--depth', '99999999']) - endif - if !empty(prog) - call add(cmd, prog) - endif - call s:spawn(name, cmd, { 'dir': spec.dir }) - else - let s:jobs[name] = { 'running': 0, 'lines': ['Already installed'], 'error': 0 } - endif - else - let s:jobs[name] = { 'running': 0, 'lines': s:lines(error), 'error': 1 } - endif - else - let cmd = ['git', 'clone'] - if !has_tag - call extend(cmd, s:clone_opt) - endif - if !empty(prog) - call add(cmd, prog) - endif - call s:spawn(name, extend(cmd, [spec.uri, s:trim(spec.dir)]), { 'new': 1 }) - endif - - if !s:jobs[name].running - call s:reap(name) - endif - if len(s:jobs) >= s:update.threads - break - endif -endwhile -endfunction - -function! s:update_python() -let py_exe = has('python') ? 'python' : 'python3' -execute py_exe "<< EOF" -import datetime -import functools -import os -try: - import queue -except ImportError: - import Queue as queue -import random -import re -import shutil -import signal -import subprocess -import tempfile -import threading as thr -import time -import traceback -import vim - -G_NVIM = vim.eval("has('nvim')") == '1' -G_PULL = vim.eval('s:update.pull') == '1' -G_RETRIES = int(vim.eval('get(g:, "plug_retries", 2)')) + 1 -G_TIMEOUT = int(vim.eval('get(g:, "plug_timeout", 60)')) -G_CLONE_OPT = ' '.join(vim.eval('s:clone_opt')) -G_PROGRESS = vim.eval('s:progress_opt(1)') -G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads')) -G_STOP = thr.Event() -G_IS_WIN = vim.eval('s:is_win') == '1' - -class PlugError(Exception): - def __init__(self, msg): - self.msg = msg -class CmdTimedOut(PlugError): - pass -class CmdFailed(PlugError): - pass -class InvalidURI(PlugError): - pass -class Action(object): - INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-'] - -class Buffer(object): - def __init__(self, lock, num_plugs, is_pull): - self.bar = '' - self.event = 'Updating' if is_pull else 'Installing' - self.lock = lock - self.maxy = int(vim.eval('winheight(".")')) - self.num_plugs = num_plugs - - def __where(self, name): - """ Find first line with name in current buffer. Return line num. """ - found, lnum = False, 0 - matcher = re.compile('^[-+x*] {0}:'.format(name)) - for line in vim.current.buffer: - if matcher.search(line) is not None: - found = True - break - lnum += 1 - - if not found: - lnum = -1 - return lnum - - def header(self): - curbuf = vim.current.buffer - curbuf[0] = self.event + ' plugins ({0}/{1})'.format(len(self.bar), self.num_plugs) - - num_spaces = self.num_plugs - len(self.bar) - curbuf[1] = '[{0}{1}]'.format(self.bar, num_spaces * ' ') - - with self.lock: - vim.command('normal! 2G') - vim.command('redraw') - - def write(self, action, name, lines): - first, rest = lines[0], lines[1:] - msg = ['{0} {1}{2}{3}'.format(action, name, ': ' if first else '', first)] - msg.extend([' ' + line for line in rest]) - - try: - if action == Action.ERROR: - self.bar += 'x' - vim.command("call add(s:update.errors, '{0}')".format(name)) - elif action == Action.DONE: - self.bar += '=' - - curbuf = vim.current.buffer - lnum = self.__where(name) - if lnum != -1: # Found matching line num - del curbuf[lnum] - if lnum > self.maxy and action in set([Action.INSTALL, Action.UPDATE]): - lnum = 3 - else: - lnum = 3 - curbuf.append(msg, lnum) - - self.header() - except vim.error: - pass - -class Command(object): - CD = 'cd /d' if G_IS_WIN else 'cd' - - def __init__(self, cmd, cmd_dir=None, timeout=60, cb=None, clean=None): - self.cmd = cmd - if cmd_dir: - self.cmd = '{0} {1} && {2}'.format(Command.CD, cmd_dir, self.cmd) - self.timeout = timeout - self.callback = cb if cb else (lambda msg: None) - self.clean = clean if clean else (lambda: None) - self.proc = None - - @property - def alive(self): - """ Returns true only if command still running. """ - return self.proc and self.proc.poll() is None - - def execute(self, ntries=3): - """ Execute the command with ntries if CmdTimedOut. - Returns the output of the command if no Exception. - """ - attempt, finished, limit = 0, False, self.timeout - - while not finished: - try: - attempt += 1 - result = self.try_command() - finished = True - return result - except CmdTimedOut: - if attempt != ntries: - self.notify_retry() - self.timeout += limit - else: - raise - - def notify_retry(self): - """ Retry required for command, notify user. """ - for count in range(3, 0, -1): - if G_STOP.is_set(): - raise KeyboardInterrupt - msg = 'Timeout. Will retry in {0} second{1} ...'.format( - count, 's' if count != 1 else '') - self.callback([msg]) - time.sleep(1) - self.callback(['Retrying ...']) - - def try_command(self): - """ Execute a cmd & poll for callback. Returns list of output. - Raises CmdFailed -> return code for Popen isn't 0 - Raises CmdTimedOut -> command exceeded timeout without new output - """ - first_line = True - - try: - tfile = tempfile.NamedTemporaryFile(mode='w+b') - preexec_fn = not G_IS_WIN and os.setsid or None - self.proc = subprocess.Popen(self.cmd, stdout=tfile, - stderr=subprocess.STDOUT, - stdin=subprocess.PIPE, shell=True, - preexec_fn=preexec_fn) - thrd = thr.Thread(target=(lambda proc: proc.wait()), args=(self.proc,)) - thrd.start() - - thread_not_started = True - while thread_not_started: - try: - thrd.join(0.1) - thread_not_started = False - except RuntimeError: - pass - - while self.alive: - if G_STOP.is_set(): - raise KeyboardInterrupt - - if first_line or random.random() < G_LOG_PROB: - first_line = False - line = '' if G_IS_WIN else nonblock_read(tfile.name) - if line: - self.callback([line]) - - time_diff = time.time() - os.path.getmtime(tfile.name) - if time_diff > self.timeout: - raise CmdTimedOut(['Timeout!']) - - thrd.join(0.5) - - tfile.seek(0) - result = [line.decode('utf-8', 'replace').rstrip() for line in tfile] - - if self.proc.returncode != 0: - raise CmdFailed([''] + result) - - return result - except: - self.terminate() - raise - - def terminate(self): - """ Terminate process and cleanup. """ - if self.alive: - if G_IS_WIN: - os.kill(self.proc.pid, signal.SIGINT) - else: - os.killpg(self.proc.pid, signal.SIGTERM) - self.clean() - -class Plugin(object): - def __init__(self, name, args, buf_q, lock): - self.name = name - self.args = args - self.buf_q = buf_q - self.lock = lock - self.tag = args.get('tag', 0) - - def manage(self): - try: - if os.path.exists(self.args['dir']): - self.update() - else: - self.install() - with self.lock: - thread_vim_command("let s:update.new['{0}'] = 1".format(self.name)) - except PlugError as exc: - self.write(Action.ERROR, self.name, exc.msg) - except KeyboardInterrupt: - G_STOP.set() - self.write(Action.ERROR, self.name, ['Interrupted!']) - except: - # Any exception except those above print stack trace - msg = 'Trace:\n{0}'.format(traceback.format_exc().rstrip()) - self.write(Action.ERROR, self.name, msg.split('\n')) - raise - - def install(self): - target = self.args['dir'] - if target[-1] == '\\': - target = target[0:-1] - - def clean(target): - def _clean(): - try: - shutil.rmtree(target) - except OSError: - pass - return _clean - - self.write(Action.INSTALL, self.name, ['Installing ...']) - callback = functools.partial(self.write, Action.INSTALL, self.name) - cmd = 'git clone {0} {1} {2} {3} 2>&1'.format( - '' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'], - esc(target)) - com = Command(cmd, None, G_TIMEOUT, callback, clean(target)) - result = com.execute(G_RETRIES) - self.write(Action.DONE, self.name, result[-1:]) - - def repo_uri(self): - cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url' - command = Command(cmd, self.args['dir'], G_TIMEOUT,) - result = command.execute(G_RETRIES) - return result[-1] - - def update(self): - actual_uri = self.repo_uri() - expect_uri = self.args['uri'] - regex = re.compile(r'^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$') - ma = regex.match(actual_uri) - mb = regex.match(expect_uri) - if ma is None or mb is None or ma.groups() != mb.groups(): - msg = ['', - 'Invalid URI: {0}'.format(actual_uri), - 'Expected {0}'.format(expect_uri), - 'PlugClean required.'] - raise InvalidURI(msg) - - if G_PULL: - self.write(Action.UPDATE, self.name, ['Updating ...']) - callback = functools.partial(self.write, Action.UPDATE, self.name) - fetch_opt = '--depth 99999999' if self.tag and os.path.isfile(os.path.join(self.args['dir'], '.git/shallow')) else '' - cmd = 'git fetch {0} {1} 2>&1'.format(fetch_opt, G_PROGRESS) - com = Command(cmd, self.args['dir'], G_TIMEOUT, callback) - result = com.execute(G_RETRIES) - self.write(Action.DONE, self.name, result[-1:]) - else: - self.write(Action.DONE, self.name, ['Already installed']) - - def write(self, action, name, msg): - self.buf_q.put((action, name, msg)) - -class PlugThread(thr.Thread): - def __init__(self, tname, args): - super(PlugThread, self).__init__() - self.tname = tname - self.args = args - - def run(self): - thr.current_thread().name = self.tname - buf_q, work_q, lock = self.args - - try: - while not G_STOP.is_set(): - name, args = work_q.get_nowait() - plug = Plugin(name, args, buf_q, lock) - plug.manage() - work_q.task_done() - except queue.Empty: - pass - -class RefreshThread(thr.Thread): - def __init__(self, lock): - super(RefreshThread, self).__init__() - self.lock = lock - self.running = True - - def run(self): - while self.running: - with self.lock: - thread_vim_command('noautocmd normal! a') - time.sleep(0.33) - - def stop(self): - self.running = False - -if G_NVIM: - def thread_vim_command(cmd): - vim.session.threadsafe_call(lambda: vim.command(cmd)) -else: - def thread_vim_command(cmd): - vim.command(cmd) - -def esc(name): - return '"' + name.replace('"', '\"') + '"' - -def nonblock_read(fname): - """ Read a file with nonblock flag. Return the last line. """ - fread = os.open(fname, os.O_RDONLY | os.O_NONBLOCK) - buf = os.read(fread, 100000).decode('utf-8', 'replace') - os.close(fread) - - line = buf.rstrip('\r\n') - left = max(line.rfind('\r'), line.rfind('\n')) - if left != -1: - left += 1 - line = line[left:] - - return line - -def main(): - thr.current_thread().name = 'main' - nthreads = int(vim.eval('s:update.threads')) - plugs = vim.eval('s:update.todo') - mac_gui = vim.eval('s:mac_gui') == '1' - - lock = thr.Lock() - buf = Buffer(lock, len(plugs), G_PULL) - buf_q, work_q = queue.Queue(), queue.Queue() - for work in plugs.items(): - work_q.put(work) - - start_cnt = thr.active_count() - for num in range(nthreads): - tname = 'PlugT-{0:02}'.format(num) - thread = PlugThread(tname, (buf_q, work_q, lock)) - thread.start() - if mac_gui: - rthread = RefreshThread(lock) - rthread.start() - - while not buf_q.empty() or thr.active_count() != start_cnt: - try: - action, name, msg = buf_q.get(True, 0.25) - buf.write(action, name, ['OK'] if not msg else msg) - buf_q.task_done() - except queue.Empty: - pass - except KeyboardInterrupt: - G_STOP.set() - - if mac_gui: - rthread.stop() - rthread.join() - -main() -EOF -endfunction - -function! s:update_ruby() - ruby << EOF - module PlugStream - SEP = ["\r", "\n", nil] - def get_line - buffer = '' - loop do - char = readchar rescue return - if SEP.include? char.chr - buffer << $/ - break - else - buffer << char - end - end - buffer - end - end unless defined?(PlugStream) - - def esc arg - %["#{arg.gsub('"', '\"')}"] - end - - def killall pid - pids = [pid] - if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM - pids.each { |pid| Process.kill 'INT', pid.to_i rescue nil } - else - unless `which pgrep 2> /dev/null`.empty? - children = pids - until children.empty? - children = children.map { |pid| - `pgrep -P #{pid}`.lines.map { |l| l.chomp } - }.flatten - pids += children - end - end - pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil } - end - end - - def compare_git_uri a, b - regex = %r{^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$} - regex.match(a).to_a.drop(1) == regex.match(b).to_a.drop(1) - end - - require 'thread' - require 'fileutils' - require 'timeout' - running = true - iswin = VIM::evaluate('s:is_win').to_i == 1 - pull = VIM::evaluate('s:update.pull').to_i == 1 - base = VIM::evaluate('g:plug_home') - all = VIM::evaluate('s:update.todo') - limit = VIM::evaluate('get(g:, "plug_timeout", 60)') - tries = VIM::evaluate('get(g:, "plug_retries", 2)') + 1 - nthr = VIM::evaluate('s:update.threads').to_i - maxy = VIM::evaluate('winheight(".")').to_i - vim7 = VIM::evaluate('v:version').to_i <= 703 && RUBY_PLATFORM =~ /darwin/ - cd = iswin ? 'cd /d' : 'cd' - tot = VIM::evaluate('len(s:update.todo)') || 0 - bar = '' - skip = 'Already installed' - mtx = Mutex.new - take1 = proc { mtx.synchronize { running && all.shift } } - logh = proc { - cnt = bar.length - $curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})" - $curbuf[2] = '[' + bar.ljust(tot) + ']' - VIM::command('normal! 2G') - VIM::command('redraw') - } - where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } } - log = proc { |name, result, type| - mtx.synchronize do - ing = ![true, false].include?(type) - bar += type ? '=' : 'x' unless ing - b = case type - when :install then '+' when :update then '*' - when true, nil then '-' else - VIM::command("call add(s:update.errors, '#{name}')") - 'x' - end - result = - if type || type.nil? - ["#{b} #{name}: #{result.lines.to_a.last || 'OK'}"] - elsif result =~ /^Interrupted|^Timeout/ - ["#{b} #{name}: #{result}"] - else - ["#{b} #{name}"] + result.lines.map { |l| " " << l } - end - if lnum = where.call(name) - $curbuf.delete lnum - lnum = 4 if ing && lnum > maxy - end - result.each_with_index do |line, offset| - $curbuf.append((lnum || 4) - 1 + offset, line.gsub(/\e\[./, '').chomp) - end - logh.call - end - } - bt = proc { |cmd, name, type, cleanup| - tried = timeout = 0 - begin - tried += 1 - timeout += limit - fd = nil - data = '' - if iswin - Timeout::timeout(timeout) do - tmp = VIM::evaluate('tempname()') - system("(#{cmd}) > #{tmp}") - data = File.read(tmp).chomp - File.unlink tmp rescue nil - end - else - fd = IO.popen(cmd).extend(PlugStream) - first_line = true - log_prob = 1.0 / nthr - while line = Timeout::timeout(timeout) { fd.get_line } - data << line - log.call name, line.chomp, type if name && (first_line || rand < log_prob) - first_line = false - end - fd.close - end - [$? == 0, data.chomp] - rescue Timeout::Error, Interrupt => e - if fd && !fd.closed? - killall fd.pid - fd.close - end - cleanup.call if cleanup - if e.is_a?(Timeout::Error) && tried < tries - 3.downto(1) do |countdown| - s = countdown > 1 ? 's' : '' - log.call name, "Timeout. Will retry in #{countdown} second#{s} ...", type - sleep 1 - end - log.call name, 'Retrying ...', type - retry - end - [false, e.is_a?(Interrupt) ? "Interrupted!" : "Timeout!"] - end - } - main = Thread.current - threads = [] - watcher = Thread.new { - if vim7 - while VIM::evaluate('getchar(1)') - sleep 0.1 - end - else - require 'io/console' # >= Ruby 1.9 - nil until IO.console.getch == 3.chr - end - mtx.synchronize do - running = false - threads.each { |t| t.raise Interrupt } unless vim7 - end - threads.each { |t| t.join rescue nil } - main.kill - } - refresh = Thread.new { - while true - mtx.synchronize do - break unless running - VIM::command('noautocmd normal! a') - end - sleep 0.2 - end - } if VIM::evaluate('s:mac_gui') == 1 - - clone_opt = VIM::evaluate('s:clone_opt').join(' ') - progress = VIM::evaluate('s:progress_opt(1)') - nthr.times do - mtx.synchronize do - threads << Thread.new { - while pair = take1.call - name = pair.first - dir, uri, tag = pair.last.values_at *%w[dir uri tag] - exists = File.directory? dir - ok, result = - if exists - chdir = "#{cd} #{iswin ? dir : esc(dir)}" - ret, data = bt.call "#{chdir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url", nil, nil, nil - current_uri = data.lines.to_a.last - if !ret - if data =~ /^Interrupted|^Timeout/ - [false, data] - else - [false, [data.chomp, "PlugClean required."].join($/)] - end - elsif !compare_git_uri(current_uri, uri) - [false, ["Invalid URI: #{current_uri}", - "Expected: #{uri}", - "PlugClean required."].join($/)] - else - if pull - log.call name, 'Updating ...', :update - fetch_opt = (tag && File.exist?(File.join(dir, '.git/shallow'))) ? '--depth 99999999' : '' - bt.call "#{chdir} && git fetch #{fetch_opt} #{progress} 2>&1", name, :update, nil - else - [true, skip] - end - end - else - d = esc dir.sub(%r{[\\/]+$}, '') - log.call name, 'Installing ...', :install - bt.call "git clone #{clone_opt unless tag} #{progress} #{uri} #{d} 2>&1", name, :install, proc { - FileUtils.rm_rf dir - } - end - mtx.synchronize { VIM::command("let s:update.new['#{name}'] = 1") } if !exists && ok - log.call name, result, ok - end - } if running - end - end - threads.each { |t| t.join rescue nil } - logh.call - refresh.kill if refresh - watcher.kill -EOF -endfunction - -function! s:shellesc_cmd(arg, script) - let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g') - return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g') -endfunction - -function! s:shellesc_ps1(arg) - return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'" -endfunction - -function! s:shellesc_sh(arg) - return "'".substitute(a:arg, "'", "'\\\\''", 'g')."'" -endfunction - -" Escape the shell argument based on the shell. -" Vim and Neovim's shellescape() are insufficient. -" 1. shellslash determines whether to use single/double quotes. -" Double-quote escaping is fragile for cmd.exe. -" 2. It does not work for powershell. -" 3. It does not work for *sh shells if the command is executed -" via cmd.exe (ie. cmd.exe /c sh -c command command_args) -" 4. It does not support batchfile syntax. -" -" Accepts an optional dictionary with the following keys: -" - shell: same as Vim/Neovim 'shell' option. -" If unset, fallback to 'cmd.exe' on Windows or 'sh'. -" - script: If truthy and shell is cmd.exe, escape for batchfile syntax. -function! plug#shellescape(arg, ...) - if a:arg =~# '^[A-Za-z0-9_/:.-]\+$' - return a:arg - endif - let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {} - let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh') - let script = get(opts, 'script', 1) - if shell =~# 'cmd\(\.exe\)\?$' - return s:shellesc_cmd(a:arg, script) - elseif s:is_powershell(shell) - return s:shellesc_ps1(a:arg) - endif - return s:shellesc_sh(a:arg) -endfunction - -function! s:glob_dir(path) - return map(filter(s:glob(a:path, '**'), 'isdirectory(v:val)'), 's:dirpath(v:val)') -endfunction - -function! s:progress_bar(line, bar, total) - call setline(a:line, '[' . s:lpad(a:bar, a:total) . ']') -endfunction - -function! s:compare_git_uri(a, b) - " See `git help clone' - " https:// [user@] github.com[:port] / junegunn/vim-plug [.git] - " [git@] github.com[:port] : junegunn/vim-plug [.git] - " file:// / junegunn/vim-plug [/] - " / junegunn/vim-plug [/] - let pat = '^\%(\w\+://\)\='.'\%([^@/]*@\)\='.'\([^:/]*\%(:[0-9]*\)\=\)'.'[:/]'.'\(.\{-}\)'.'\%(\.git\)\=/\?$' - let ma = matchlist(a:a, pat) - let mb = matchlist(a:b, pat) - return ma[1:2] ==# mb[1:2] -endfunction - -function! s:format_message(bullet, name, message) - if a:bullet != 'x' - return [printf('%s %s: %s', a:bullet, a:name, s:lastline(a:message))] - else - let lines = map(s:lines(a:message), '" ".v:val') - return extend([printf('x %s:', a:name)], lines) - endif -endfunction - -function! s:with_cd(cmd, dir, ...) - let script = a:0 > 0 ? a:1 : 1 - return printf('cd%s %s && %s', s:is_win ? ' /d' : '', plug#shellescape(a:dir, {'script': script}), a:cmd) -endfunction - -function! s:system(cmd, ...) - let batchfile = '' - try - let [sh, shellcmdflag, shrd] = s:chsh(1) - if type(a:cmd) == s:TYPE.list - " Neovim's system() supports list argument to bypass the shell - " but it cannot set the working directory for the command. - " Assume that the command does not rely on the shell. - if has('nvim') && a:0 == 0 - return system(a:cmd) - endif - let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"shell": &shell, "script": 0})')) - if s:is_powershell(&shell) - let cmd = '& ' . cmd - endif - else - let cmd = a:cmd - endif - if a:0 > 0 - let cmd = s:with_cd(cmd, a:1, type(a:cmd) != s:TYPE.list) - endif - if s:is_win && type(a:cmd) != s:TYPE.list - let [batchfile, cmd] = s:batchfile(cmd) - endif - return system(cmd) - finally - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) - call delete(batchfile) - endif - endtry -endfunction - -function! s:system_chomp(...) - let ret = call('s:system', a:000) - return v:shell_error ? '' : substitute(ret, '\n$', '', '') -endfunction - -function! s:git_validate(spec, check_branch) - let err = '' - if isdirectory(a:spec.dir) - let result = [s:git_local_branch(a:spec.dir), s:git_origin_url(a:spec.dir)] - let remote = result[-1] - if empty(remote) - let err = join([remote, 'PlugClean required.'], "\n") - elseif !s:compare_git_uri(remote, a:spec.uri) - let err = join(['Invalid URI: '.remote, - \ 'Expected: '.a:spec.uri, - \ 'PlugClean required.'], "\n") - elseif a:check_branch && has_key(a:spec, 'commit') - let sha = s:git_revision(a:spec.dir) - if empty(sha) - let err = join(add(result, 'PlugClean required.'), "\n") - elseif !s:hash_match(sha, a:spec.commit) - let err = join([printf('Invalid HEAD (expected: %s, actual: %s)', - \ a:spec.commit[:6], sha[:6]), - \ 'PlugUpdate required.'], "\n") - endif - elseif a:check_branch - let current_branch = result[0] - " Check tag - let origin_branch = s:git_origin_branch(a:spec) - if has_key(a:spec, 'tag') - let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir) - if a:spec.tag !=# tag && a:spec.tag !~ '\*' - let err = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.', - \ (empty(tag) ? 'N/A' : tag), a:spec.tag) - endif - " Check branch - elseif origin_branch !=# current_branch - let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.', - \ current_branch, origin_branch) - endif - if empty(err) - let [ahead, behind] = split(s:lastline(s:system([ - \ 'git', 'rev-list', '--count', '--left-right', - \ printf('HEAD...origin/%s', origin_branch) - \ ], a:spec.dir)), '\t') - if !v:shell_error && ahead - if behind - " Only mention PlugClean if diverged, otherwise it's likely to be - " pushable (and probably not that messed up). - let err = printf( - \ "Diverged from origin/%s (%d commit(s) ahead and %d commit(s) behind!\n" - \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', origin_branch, ahead, behind) - else - let err = printf("Ahead of origin/%s by %d commit(s).\n" - \ .'Cannot update until local changes are pushed.', - \ origin_branch, ahead) - endif - endif - endif - endif - else - let err = 'Not found' - endif - return [err, err =~# 'PlugClean'] -endfunction - -function! s:rm_rf(dir) - if isdirectory(a:dir) - return s:system(s:is_win - \ ? 'rmdir /S /Q '.plug#shellescape(a:dir) - \ : ['rm', '-rf', a:dir]) - endif -endfunction - -function! s:clean(force) - call s:prepare() - call append(0, 'Searching for invalid plugins in '.g:plug_home) - call append(1, '') - - " List of valid directories - let dirs = [] - let errs = {} - let [cnt, total] = [0, len(g:plugs)] - for [name, spec] in items(g:plugs) - if !s:is_managed(name) - call add(dirs, spec.dir) - else - let [err, clean] = s:git_validate(spec, 1) - if clean - let errs[spec.dir] = s:lines(err)[0] - else - call add(dirs, spec.dir) - endif - endif - let cnt += 1 - call s:progress_bar(2, repeat('=', cnt), total) - normal! 2G - redraw - endfor - - let allowed = {} - for dir in dirs - let allowed[s:dirpath(s:plug_fnamemodify(dir, ':h:h'))] = 1 - let allowed[dir] = 1 - for child in s:glob_dir(dir) - let allowed[child] = 1 - endfor - endfor - - let todo = [] - let found = sort(s:glob_dir(g:plug_home)) - while !empty(found) - let f = remove(found, 0) - if !has_key(allowed, f) && isdirectory(f) - call add(todo, f) - call append(line('$'), '- ' . f) - if has_key(errs, f) - call append(line('$'), ' ' . errs[f]) - endif - let found = filter(found, 'stridx(v:val, f) != 0') - end - endwhile - - 4 - redraw - if empty(todo) - call append(line('$'), 'Already clean.') - else - let s:clean_count = 0 - call append(3, ['Directories to delete:', '']) - redraw! - if a:force || s:ask_no_interrupt('Delete all directories?') - call s:delete([6, line('$')], 1) - else - call setline(4, 'Cancelled.') - nnoremap d :set opfunc=delete_opg@ - nmap dd d_ - xnoremap d :call delete_op(visualmode(), 1) - echo 'Delete the lines (d{motion}) to delete the corresponding directories' - endif - endif - 4 - setlocal nomodifiable -endfunction - -function! s:delete_op(type, ...) - call s:delete(a:0 ? [line("'<"), line("'>")] : [line("'["), line("']")], 0) -endfunction - -function! s:delete(range, force) - let [l1, l2] = a:range - let force = a:force - let err_count = 0 - while l1 <= l2 - let line = getline(l1) - if line =~ '^- ' && isdirectory(line[2:]) - execute l1 - redraw! - let answer = force ? 1 : s:ask('Delete '.line[2:].'?', 1) - let force = force || answer > 1 - if answer - let err = s:rm_rf(line[2:]) - setlocal modifiable - if empty(err) - call setline(l1, '~'.line[1:]) - let s:clean_count += 1 - else - delete _ - call append(l1 - 1, s:format_message('x', line[1:], err)) - let l2 += len(s:lines(err)) - let err_count += 1 - endif - let msg = printf('Removed %d directories.', s:clean_count) - if err_count > 0 - let msg .= printf(' Failed to remove %d directories.', err_count) - endif - call setline(4, msg) - setlocal nomodifiable - endif - endif - let l1 += 1 - endwhile -endfunction - -function! s:upgrade() - echo 'Downloading the latest version of vim-plug' - redraw - let tmp = s:plug_tempname() - let new = tmp . '/plug.vim' - - try - let out = s:system(['git', 'clone', '--depth', '1', s:plug_src, tmp]) - if v:shell_error - return s:err('Error upgrading vim-plug: '. out) - endif - - if readfile(s:me) ==# readfile(new) - echo 'vim-plug is already up-to-date' - return 0 - else - call rename(s:me, s:me . '.old') - call rename(new, s:me) - unlet g:loaded_plug - echo 'vim-plug has been upgraded' - return 1 - endif - finally - silent! call s:rm_rf(tmp) - endtry -endfunction - -function! s:upgrade_specs() - for spec in values(g:plugs) - let spec.frozen = get(spec, 'frozen', 0) - endfor -endfunction - -function! s:status() - call s:prepare() - call append(0, 'Checking plugins') - call append(1, '') - - let ecnt = 0 - let unloaded = 0 - let [cnt, total] = [0, len(g:plugs)] - for [name, spec] in items(g:plugs) - let is_dir = isdirectory(spec.dir) - if has_key(spec, 'uri') - if is_dir - let [err, _] = s:git_validate(spec, 1) - let [valid, msg] = [empty(err), empty(err) ? 'OK' : err] - else - let [valid, msg] = [0, 'Not found. Try PlugInstall.'] - endif - else - if is_dir - let [valid, msg] = [1, 'OK'] - else - let [valid, msg] = [0, 'Not found.'] - endif - endif - let cnt += 1 - let ecnt += !valid - " `s:loaded` entry can be missing if PlugUpgraded - if is_dir && get(s:loaded, name, -1) == 0 - let unloaded = 1 - let msg .= ' (not loaded)' - endif - call s:progress_bar(2, repeat('=', cnt), total) - call append(3, s:format_message(valid ? '-' : 'x', name, msg)) - normal! 2G - redraw - endfor - call setline(1, 'Finished. '.ecnt.' error(s).') - normal! gg - setlocal nomodifiable - if unloaded - echo "Press 'L' on each line to load plugin, or 'U' to update" - nnoremap L :call status_load(line('.')) - xnoremap L :call status_load(line('.')) - end -endfunction - -function! s:extract_name(str, prefix, suffix) - return matchstr(a:str, '^'.a:prefix.' \zs[^:]\+\ze:.*'.a:suffix.'$') -endfunction - -function! s:status_load(lnum) - let line = getline(a:lnum) - let name = s:extract_name(line, '-', '(not loaded)') - if !empty(name) - call plug#load(name) - setlocal modifiable - call setline(a:lnum, substitute(line, ' (not loaded)$', '', '')) - setlocal nomodifiable - endif -endfunction - -function! s:status_update() range - let lines = getline(a:firstline, a:lastline) - let names = filter(map(lines, 's:extract_name(v:val, "[x-]", "")'), '!empty(v:val)') - if !empty(names) - echo - execute 'PlugUpdate' join(names) - endif -endfunction - -function! s:is_preview_window_open() - silent! wincmd P - if &previewwindow - wincmd p - return 1 - endif -endfunction - -function! s:find_name(lnum) - for lnum in reverse(range(1, a:lnum)) - let line = getline(lnum) - if empty(line) - return '' - endif - let name = s:extract_name(line, '-', '') - if !empty(name) - return name - endif - endfor - return '' -endfunction - -function! s:preview_commit() - if b:plug_preview < 0 - let b:plug_preview = !s:is_preview_window_open() - endif - - let sha = matchstr(getline('.'), '^ \X*\zs[0-9a-f]\{7,9}') - if empty(sha) - let name = matchstr(getline('.'), '^- \zs[^:]*\ze:$') - if empty(name) - return - endif - let title = 'HEAD@{1}..' - let command = 'git diff --no-color HEAD@{1}' - else - let title = sha - let command = 'git show --no-color --pretty=medium '.sha - let name = s:find_name(line('.')) - endif - - if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir) - return - endif - - if exists('g:plug_pwindow') && !s:is_preview_window_open() - execute g:plug_pwindow - execute 'e' title - else - execute 'pedit' title - wincmd P - endif - setlocal previewwindow filetype=git buftype=nofile bufhidden=wipe nobuflisted modifiable - let batchfile = '' - try - let [sh, shellcmdflag, shrd] = s:chsh(1) - let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && '.command - if s:is_win - let [batchfile, cmd] = s:batchfile(cmd) - endif - execute 'silent %!' cmd - finally - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) - call delete(batchfile) - endif - endtry - setlocal nomodifiable - nnoremap q :q - wincmd p -endfunction - -function! s:section(flags) - call search('\(^[x-] \)\@<=[^:]\+:', a:flags) -endfunction - -function! s:format_git_log(line) - let indent = ' ' - let tokens = split(a:line, nr2char(1)) - if len(tokens) != 5 - return indent.substitute(a:line, '\s*$', '', '') - endif - let [graph, sha, refs, subject, date] = tokens - let tag = matchstr(refs, 'tag: [^,)]\+') - let tag = empty(tag) ? ' ' : ' ('.tag.') ' - return printf('%s%s%s%s%s (%s)', indent, graph, sha, tag, subject, date) -endfunction - -function! s:append_ul(lnum, text) - call append(a:lnum, ['', a:text, repeat('-', len(a:text))]) -endfunction - -function! s:diff() - call s:prepare() - call append(0, ['Collecting changes ...', '']) - let cnts = [0, 0] - let bar = '' - let total = filter(copy(g:plugs), 's:is_managed(v:key) && isdirectory(v:val.dir)') - call s:progress_bar(2, bar, len(total)) - for origin in [1, 0] - let plugs = reverse(sort(items(filter(copy(total), (origin ? '' : '!').'(has_key(v:val, "commit") || has_key(v:val, "tag"))')))) - if empty(plugs) - continue - endif - call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:') - for [k, v] in plugs - let branch = s:git_origin_branch(v) - if len(branch) - let range = origin ? '..origin/'.branch : 'HEAD@{1}..' - let cmd = ['git', 'log', '--graph', '--color=never'] - if s:git_version_requirement(2, 10, 0) - call add(cmd, '--no-show-signature') - endif - call extend(cmd, ['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range]) - if has_key(v, 'rtp') - call extend(cmd, ['--', v.rtp]) - endif - let diff = s:system_chomp(cmd, v.dir) - if !empty(diff) - let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : '' - call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)'))) - let cnts[origin] += 1 - endif - endif - let bar .= '=' - call s:progress_bar(2, bar, len(total)) - normal! 2G - redraw - endfor - if !cnts[origin] - call append(5, ['', 'N/A']) - endif - endfor - call setline(1, printf('%d plugin(s) updated.', cnts[0]) - \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : '')) - - if cnts[0] || cnts[1] - nnoremap (plug-preview) :silent! call preview_commit() - if empty(maparg("\", 'n')) - nmap (plug-preview) - endif - if empty(maparg('o', 'n')) - nmap o (plug-preview) - endif - endif - if cnts[0] - nnoremap X :call revert() - echo "Press 'X' on each block to revert the update" - endif - normal! gg - setlocal nomodifiable -endfunction - -function! s:revert() - if search('^Pending updates', 'bnW') - return - endif - - let name = s:find_name(line('.')) - if empty(name) || !has_key(g:plugs, name) || - \ input(printf('Revert the update of %s? (y/N) ', name)) !~? '^y' - return - endif - - call s:system('git reset --hard HEAD@{1} && git checkout '.plug#shellescape(g:plugs[name].branch).' --', g:plugs[name].dir) - setlocal modifiable - normal! "_dap - setlocal nomodifiable - echo 'Reverted' -endfunction - -function! s:snapshot(force, ...) abort - call s:prepare() - setf vim - call append(0, ['" Generated by vim-plug', - \ '" '.strftime("%c"), - \ '" :source this file in vim to restore the snapshot', - \ '" or execute: vim -S snapshot.vim', - \ '', '', 'PlugUpdate!']) - 1 - let anchor = line('$') - 3 - let names = sort(keys(filter(copy(g:plugs), - \'has_key(v:val, "uri") && isdirectory(v:val.dir)'))) - for name in reverse(names) - let sha = has_key(g:plugs[name], 'commit') ? g:plugs[name].commit : s:git_revision(g:plugs[name].dir) - if !empty(sha) - call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha)) - redraw - endif - endfor - - if a:0 > 0 - let fn = s:plug_expand(a:1) - if filereadable(fn) && !(a:force || s:ask(a:1.' already exists. Overwrite?')) - return - endif - call writefile(getline(1, '$'), fn) - echo 'Saved as '.a:1 - silent execute 'e' s:esc(fn) - setf vim - endif -endfunction - -function! s:split_rtp() - return split(&rtp, '\\\@,[,],h,l" + +--vim.opt.timeout = false + +vim.opt.foldmethod = "expr" +vim.opt.foldlevel = 99 +vim.opt.foldexpr = "nvim_treesitter#foldexpr()" + +vim.opt.diffopt:append("vertical") +vim.opt.diffopt:append("linematch:50") +-- todo visualbell needed? + +vim.opt.shell = "/bin/zsh" +vim.opt.ignorecase = true +vim.opt.smartcase = true +vim.opt.inccommand = "split" +vim.opt.listchars = "tab:⇥\\ ,trail:-,nbsp:+,lead:␣" +--vim.opt.list = true +vim.cmd([[hi link Whitespace Comment]]) + +vim.opt.wildmode = { "list:longest", "list:full" } +vim.opt.wildignore = { "*.so", "*.swp", "*.zip", "*.o" } +vim.opt.suffixes = { + ".bak", + "~", + ".h", + ".info", + ".swp", + ".obj", + ".info", + ".aux", + ".dvi", + ".bbl", + ".out", + ".o", + ".lo", + "\\.class", + ".pdf", +} + +vim.opt.completeopt = "menu,menuone,noselect" +vim.opt.mouse = "" +vim.opt.shortmess = vim.o.shortmess .. "c" + +vim.opt.cursorline = true +vim.opt.undofile = true + +vim.opt.spelllang = "de,en" + +vim.opt.termguicolors = true +vim.opt.pumblend = 10 + +vim.opt.updatetime = 300 + +local command = vim.api.nvim_create_user_command +local initlua = vim.fn.stdpath("config") .. "/init.lua" +command("RC", function() + vim.cmd.edit(initlua) +end, { desc = "edit init.lua" }) +command("CD", ":cd %:h", { desc = "cd to current file" }) +command("TrailingSpace", "%s/\\s*$//g", { desc = "remove trailing spaces" }) + +local key = vim.keymap.set + +key("n", "", "za", { desc = "toggle fold" }) +key("v", ".", "normal .", { desc = "repeat last command in visual mode" }) +key("n", "cy", '"*y', { desc = "copy to system clipboard" }) + +key("t", "", "", { desc = "exit terminal mode" }) + +-- Arrow keys for window movement and resizing +key("n", "", "h") +key("n", "", "j") +key("n", "", "k") +key("n", "", "l") +-- +key("n", "", "<") +key("n", "", ">") +key("n", "", "-") +key("n", "", "+") + +key("n", "", function() + vim.fn.search("^[^[:space:])\\]}]", "be") +end, { desc = "jump to previous unindented line" }) +key("n", "", function() + vim.fn.search("^[^[:space:])\\]}]", "e") +end, { desc = "jump to next unindented line" }) + +key("i", "", "u") +key("n", "&", ":&&") +key("x", "&", ":&&") +key("n", "Y", "y$") + +key("i", "", "", { desc = "completion" }) +key("n", "", "nohredraw!", { desc = "clear search highlight" }) +key("v", "gs", "'<,'>sort", { desc = "sort selection" }) diff --git a/init.vim b/init.vim deleted file mode 100644 index 8d2cd3e..0000000 --- a/init.vim +++ /dev/null @@ -1,199 +0,0 @@ -if exists("$VIRTUAL_ENV") - let g:python3_host_prog=substitute(system("which -a python3 | head -n2 | tail -n1"), "\n", '', 'g') -else - let g:python3_host_prog=substitute(system("which python3"), "\n", '', 'g') -endif - -runtime packages.vim - -let $MYVIMDIR=split(&rtp, ',')[0] - -set exrc - -set background=dark -let g:chroma_italic_style="bold" -let g:chroma_nontext_dark=1 -colo chroma - -if exists("&cc") - set cc=+1 -endif - -set number - -set textwidth=80 -set tabstop=2 -set shiftwidth=2 - -set whichwrap+=<,>,h,l - -set notimeout -set ttimeout -set ttimeoutlen=50 - -set foldmethod=syntax -set foldlevelstart=99 - -" disables visualbell -set vb t_vb= - -set shellcmdflag=-c -set shell=/bin/zsh - -set modeline -set showcmd - -set ignorecase smartcase -set inccommand=split -set wildmode=list:longest,list:full -set wildignore+=*.so,*.swp,*.zip,*.o -set suffixes=.bak,~,.h,.info,.swp,.obj,.info,.aux,.dvi,.bbl,.out,.o,.lo,\.class -set suffixes+=.pdf -set wildmenu -set hidden - -"set completeopt=menu,noinsert,preview -"set completeopt=menuone,noinsert,noselect -set completeopt=menu,menuone,noselect -set shortmess+=c -inoremap pumvisible() ? "\" : "\u\" - -set mouse= - -set cursorline -set guicursor= - -set undofile -set undodir=~/.local/share/nvim/undo - -set spelllang=de - -set termguicolors -set pumblend=20 - -set updatetime=300 - -" custom commands -command! RC edit $MYVIMRC -command! SRC source $MYVIMRC -command! CD :cd %:h -command! PlugEdit edit $MYVIMDIR/packages.vim -command! PlugReload source $MYVIMDIR/packages.vim | PlugInstall -command! TrailingSpace %s/\s*$//g - - -"{{{ latex - -" controls filetype setting, therefore not possible to move to ftplugin -let g:tex_flavor = "latex" - -"}}} - -" {{{ misc Autocommands -augroup Misc - au FileType mail setlocal spell - au FileType man setlocal nonu -augroup END - - -augroup Cache - autocmd! - autocmd BufRead,BufNewFile ~/Private/* setlocal directory=. -augroup END - -"{{{ binary editing -augroup Binary - au! - au BufReadPre *.bin let &bin=1 - au BufReadPost *.bin if &bin | %!xxd - au BufReadPost *.bin set ft=xxd | endif - au BufWritePre *.bin if &bin | %!xxd -r - au BufWritePre *.bin endif - au BufWritePost *.bin if &bin | %!xxd - au BufWritePost *.bin set nomod | endif -augroup END -"}}} - -"}}} - -" common mappings {{{ - -nnoremap za -vnoremap . normal . -noremap cy "*y - -tnoremap - -map h -map j -map k -map l - -map < -map > -map - -map + - -" navigate windows with alt+[hjkl] -tnoremap h -tnoremap j -tnoremap k -tnoremap l -inoremap h -inoremap j -inoremap k -inoremap l -nnoremap h -nnoremap j -nnoremap k -nnoremap l - -nnoremap :call search('^[^[:space:])\]}]', 'be') -nnoremap :call search('^[^[:space:])\]}]', 'e') - -inoremap u -nnoremap & :&& -xnoremap & :&& -nnoremap Y y$ - -inoremap - -nmap nohredraw! - -nmap -imap - -vmap gs '<,'>sort - -"}}} - - -"Git {{{ -nmap gu Gina push -nmap gvc !git svn dcommit -nmap gvf !git svn fetch -" Git }}} - -" Start interactive EasyAlign in visual mode (e.g. vipga) -xmap (EasyAlign) - -" Start interactive EasyAlign for a motion/text object (e.g. gaip) -nmap (EasyAlign) - -let g:signify_vcs_list = [ 'git', 'hg' ] -"let g:signify_disable_by_default = 1 - - -let g:localvimrc_whitelist='/home/crater2150/work/.*' -let g:localvimrc_sandbox=0 - -lua require("my-lsp") -lua require("lsputils") -lua require("conf.cmp") -lua require("conf.trouble") -lua require("conf.treesitter") -set foldmethod=expr -set foldexpr=nvim_treesitter#foldexpr() -set nofoldenable " Disable folding at startup. -lua require("conf.indent-blankline") -" vi:foldmethod=marker sw=2 diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 0000000..151f88b --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,77 @@ +{ + "LuaSnip": { "branch": "master", "commit": "fb525166ccc30296fb3457441eb979113de46b00" }, + "Vim-Jinja2-Syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" }, + "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, + "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" }, + "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" }, + "copilot.lua": { "branch": "master", "commit": "c1bb86abbed1a52a11ab3944ef00c8410520543d" }, + "deepl.vim": { "branch": "main", "commit": "59df8cc17bb28989ce562bf4712c724d23baadcd" }, + "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, + "gen.nvim": { "branch": "main", "commit": "c8e1f574d4a3a839dde73a87bdc319a62ee1e559" }, + "gina.vim": { "branch": "master", "commit": "ff6c2ddeca98f886b57fb42283c12e167d6ab575" }, + "gitsigns.nvim": { "branch": "main", "commit": "1b0350ab707713b2bc6c236151f1a324175347b1" }, + "hover.nvim": { "branch": "main", "commit": "07c7269c3a88751f2f36ed0563dc6e7b8b84f7f7" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" }, + "lsp-progress.nvim": { "branch": "main", "commit": "f3df1df8f5ea33d082db047b5d2d2b83cc01cd8a" }, + "lsp_signature.nvim": { "branch": "master", "commit": "2923666d092300e6d03c8d895991d0bef43f1613" }, + "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, + "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, + "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f54e3c11fc9ebfcfc27e696182b0295b071d0811" }, + "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "neoconf.nvim": { "branch": "main", "commit": "ed993a4d945b5d37cb165df3f7172c34e7fce70e" }, + "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-dap": { "branch": "master", "commit": "2edd6375692d9ac1053d50acfe415c1eb2ba92d0" }, + "nvim-genghis": { "branch": "main", "commit": "16268746ae4617be8e8989748b9a0b0372f5e3b4" }, + "nvim-jdtls": { "branch": "master", "commit": "4d77ff02063cf88963d5cf10683ab1fd15d072de" }, + "nvim-lint": { "branch": "master", "commit": "2b0039b8be9583704591a13129c600891ac2c596" }, + "nvim-lspconfig": { "branch": "master", "commit": "0112e1f77983141e1453bd37d124302f1c876c46" }, + "nvim-luadev": { "branch": "master", "commit": "3ba0c02c378503739f1fdb95cff3ea2aad48db3e" }, + "nvim-metals": { "branch": "main", "commit": "7b3057f85c7c76d85b9d2d3c97c9d34fcb9f1bdc" }, + "nvim-quick-switcher": { "branch": "main", "commit": "b56ba55cff165ae1551836a79313933bf4d43ae2" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter-context": { "branch": "master", "commit": "1a1a7c5d6d75cb49bf64049dafab15ebe294a79f" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" }, + "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, + "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, + "shipwright.nvim": { "branch": "master", "commit": "e596ab48328c31873f4f4d2e070243bf9de16ff3" }, + "splice.vim": { "branch": "master", "commit": "815a28e687fdf78b67e9b9cd4c21277bbe658873" }, + "suda.vim": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, + "telescope-lsp-handlers.nvim": { "branch": "trunk", "commit": "de02085d6af1633942549a238bc7a5524fa9b201" }, + "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, + "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, + "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, + "vim-characterize": { "branch": "master", "commit": "a8bffac6cead6b2869d939ecad06312b187a4c79" }, + "vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" }, + "vim-easy-align": { "branch": "master", "commit": "9815a55dbcd817784458df7a18acacc6f82b1241" }, + "vim-fugitive": { "branch": "master", "commit": "593f831d6f6d779cbabb70a4d1e6b1b1936a88af" }, + "vim-gitignore": { "branch": "master", "commit": "641dfa648d2581a5e5e9b0d11ffee37da8de49d7" }, + "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, + "vim-highlightedyank": { "branch": "master", "commit": "285a61425e79742997bbde76a91be6189bc988fb" }, + "vim-hocon": { "branch": "main", "commit": "5df6dc1b7c8f5811afe663b0441e6304a729dcaf" }, + "vim-indent-object": { "branch": "master", "commit": "8ab36d5ec2a3a60468437a95e142ce994df598c6" }, + "vim-kitty": { "branch": "main", "commit": "309b8451cff8ad77a24ee332b5d9db4162f1655d" }, + "vim-ledger": { "branch": "master", "commit": "aabf1976dfefe5665233c600421aea2798ff7ea0" }, + "vim-markdown-composer": { "branch": "master", "commit": "e6f99bc20cfcb277c63041b1f766e6d5940bcc76" }, + "vim-mkdir": { "branch": "master", "commit": "f0ba7a7dc190a0cedf1d827958c99f3718109cf0" }, + "vim-nftables": { "branch": "master", "commit": "26f8a506c6f3e41f1e4a8d6aa94c9a79a666bbff" }, + "vim-pass": { "branch": "master", "commit": "40d606f5b9488bf76273fd508addbee303f7b958" }, + "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, + "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, + "vim-textobj-comment": { "branch": "master", "commit": "58ae4571b76a5bf74850698f23d235eef991dd4b" }, + "vim-textobj-user": { "branch": "master", "commit": "41a675ddbeefd6a93664a4dc52f302fe3086a933" }, + "vim-theme-chroma": { "branch": "lush", "commit": "0ad7be22f2244f99a877edfd6261eaba47952b6f" }, + "vimtex": { "branch": "master", "commit": "e10525a5aa65e2544f11e680dd81c77fba800248" }, + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, + "workspace-diagnostics.nvim": { "branch": "main", "commit": "60f9175b2501ae3f8b1aba9719c0df8827610c8e" } +} diff --git a/lua/.luarc.json b/lua/.luarc.json new file mode 100644 index 0000000..841ada9 --- /dev/null +++ b/lua/.luarc.json @@ -0,0 +1,3 @@ +{ + "workspace.checkThirdParty": false +} diff --git a/lua/common.lua b/lua/common.lua new file mode 100644 index 0000000..fa3fed7 --- /dev/null +++ b/lua/common.lua @@ -0,0 +1,71 @@ +-- Adapted from https://github.com/LazyVim/LazyVim/ +-- SPDX-License-Identifier: Apache-2.0 +return { + icons = { + dap = { + Stopped = { "󰁕 ", "DiagnosticWarn", "DapStoppedLine" }, + Breakpoint = " ", + BreakpointCondition = " ", + BreakpointRejected = { " ", "DiagnosticError" }, + LogPoint = ".>", + }, + diagnostics = { + signs = { + text = { + [vim.diagnostic.severity.ERROR] = " ", + [vim.diagnostic.severity.WARN] = " ", + [vim.diagnostic.severity.HINT] = " ", + [vim.diagnostic.severity.INFO] = " ", + }, + numhl = { + [vim.diagnostic.severity.ERROR] = "DiagnosticSignError", + [vim.diagnostic.severity.WARN] = "DiagnosticSignWarn", + [vim.diagnostic.severity.INFO] = "DiagnosticSignInfo", + [vim.diagnostic.severity.HINT] = "DiagnosticSignHint", + }, + }, + }, + git = { + added = " ", + modified = " ", + removed = " ", + }, + kinds = { + Array = " ", + Boolean = " ", + Class = " ", + Color = " ", + Constant = " ", + Constructor = " ", + Copilot = " ", + Enum = " ", + EnumMember = " ", + Event = " ", + Field = " ", + File = " ", + Folder = " ", + Function = " ", + Interface = " ", + Key = " ", + Keyword = " ", + Method = " ", + Module = " ", + Namespace = " ", + Null = " ", + Number = " ", + Object = " ", + Operator = " ", + Package = " ", + Property = " ", + Reference = " ", + Snippet = " ", + String = " ", + Struct = " ", + Text = " ", + TypeParameter = " ", + Unit = " ", + Value = " ", + Variable = " ", + }, + }, +} diff --git a/lua/conf/cmp.lua b/lua/conf/cmp.lua deleted file mode 100644 index 44c3e9a..0000000 --- a/lua/conf/cmp.lua +++ /dev/null @@ -1,51 +0,0 @@ -local cmp = require'cmp' - -cmp.setup({ - snippet = { - expand = function(args) - vim.fn["vsnip#anonymous"](args.body) - end, - }, - mapping = { - [''] = cmp.mapping.confirm({ select = true }), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.close(), - [''] = cmp.mapping.confirm({ - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }), - [''] = function(fallback) - if cmp.visible() then - cmp.select_next_item() - else - fallback() - end - end - }, - sources = cmp.config.sources({ - { name = 'nvim_lsp' }, - { name = 'vsnip' }, - },{ - { name = 'buffer' }, - --{ name = 'path' }, - }), -}) - -cmp.setup.cmdline({ '/', '?' }, { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = 'buffer' } - } -}) - --- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). -cmp.setup.cmdline(':', { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ - { name = 'path' } - }, { - { name = 'cmdline' } - }) -}) diff --git a/lua/conf/indent-blankline.lua b/lua/conf/indent-blankline.lua deleted file mode 100644 index 0538c5e..0000000 --- a/lua/conf/indent-blankline.lua +++ /dev/null @@ -1,17 +0,0 @@ -vim.cmd [[highlight IndentBlanklineIndent1 guibg=#333333 gui=nocombine]] -vim.cmd [[highlight IndentBlanklineIndent2 guibg=#000000 gui=nocombine]] - -require("indent_blankline").setup { - char = "", - char_highlight_list = { - "IndentBlanklineIndent1", - "IndentBlanklineIndent2", - }, - space_char_highlight_list = { - "IndentBlanklineIndent1", - "IndentBlanklineIndent2", - }, - show_trailing_blankline_indent = false, - show_current_context = true, - show_current_context_start = true, -} diff --git a/lua/conf/telescope.lua b/lua/conf/telescope.lua deleted file mode 100644 index bbb5f71..0000000 --- a/lua/conf/telescope.lua +++ /dev/null @@ -1,3 +0,0 @@ -telescope = require('telescope') -telescope.load_extension('fzf_native') -telescope.load_extension('lsp_handlers') diff --git a/lua/conf/treesitter.lua b/lua/conf/treesitter.lua deleted file mode 100644 index 4d9554a..0000000 --- a/lua/conf/treesitter.lua +++ /dev/null @@ -1,16 +0,0 @@ -require'nvim-treesitter.configs'.setup { - ensure_installed = { "typescript" }, - sync_install = true, - auto_install = true, - highlight = { - enable = true, - -- Setting this to true will run `:h syntax` and tree-sitter at the same time. - -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). - -- Using this option may slow down your editor, and you may see some duplicate highlights. - -- Instead of true it can also be a list of languages - additional_vim_regex_highlighting = false, - }, - indent = { - enable = true - }, -} diff --git a/lua/conf/trouble.lua b/lua/conf/trouble.lua deleted file mode 100644 index a979067..0000000 --- a/lua/conf/trouble.lua +++ /dev/null @@ -1,11 +0,0 @@ -require("trouble").setup { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below -} -vim.api.nvim_set_keymap("n", "xx", "Trouble", {silent = true, noremap = true}) -vim.api.nvim_set_keymap("n", "xw", "Trouble workspace_diagnostics", {silent = true, noremap = true}) -vim.api.nvim_set_keymap("n", "xd", "Trouble document_diagnostics", {silent = true, noremap = true}) -vim.api.nvim_set_keymap("n", "xl", "Trouble loclist", {silent = true, noremap = true}) -vim.api.nvim_set_keymap("n", "xq", "Trouble quickfix", {silent = true, noremap = true}) -vim.api.nvim_set_keymap("n", "gR", "Trouble lsp_references", {silent = true, noremap = true}) diff --git a/lua/debug.lua b/lua/debug.lua new file mode 100644 index 0000000..fecfb51 --- /dev/null +++ b/lua/debug.lua @@ -0,0 +1,39 @@ +-- Setup nvim-cmp. +local cmp = require("cmp") + +cmp.setup({ + snippet = { + expand = function(args) + --vim.fn["vsnip#anonymous"](args.body) + require("luasnip").lsp_expand(args.body) + end, + }, + mapping = { + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.close(), + [""] = cmp.mapping.confirm({ select = true }), + }, + sources = { + { name = "nvim_lsp" }, + + -- For vsnip user. + { name = "vsnip" }, + + -- For luasnip user. + -- { name = 'luasnip' }, + + -- For ultisnips user. + -- { name = 'ultisnips' }, + + { name = "buffer" }, + }, +}) + +-- Setup lsp. +metals_config = require("metals").bare_config +metals_config.init_options.statusBarProvider = "on" +metals_config.settings = { showImplicitArguments = true } +metals_config.on_attach = on_attach +metals_config.capabilities = require("cmp_nvim_lsp").update_capabilities(vim.lsp.protocol.make_client_capabilities()) diff --git a/lua/findroot.lua b/lua/findroot.lua new file mode 100644 index 0000000..a301dec --- /dev/null +++ b/lua/findroot.lua @@ -0,0 +1,50 @@ +local Path = require("plenary.path") +local source_basedir_markers = { + ".telescope-root", + ".editorconfig", + "build.sbt", + "package.json", + "setup.py", + ".git", +} +function find_upwards_any(base, filenames) + local folder = Path:new(base) + local root = Path.path.root(folder) + + while folder:absolute() ~= root do + for _, filename in ipairs(filenames) do + local p = folder:joinpath(filename) + if p:exists() then + return p + end + end + folder = folder:parent() + end + return "" +end + +local function find_dir(base) + print("base: ", base) + if base == nil then + base = vim.loop.cwd() + end + --@type Path + local search_root + search_root = find_upwards_any(base, source_basedir_markers) + print("search_root: ", search_root) + if search_root ~= "" then + local file = search_root:_split() + if file[#file] == ".telescope-root" then + local target = search_root:parent():joinpath(search_root:head(1)) + if target:exists() then + return tostring(target) + end + else + return tostring(search_root:parent()) + end + else + return base + end +end + +return find_dir diff --git a/lua/lsp/installer.lua b/lua/lsp/installer.lua deleted file mode 100644 index 6214255..0000000 --- a/lua/lsp/installer.lua +++ /dev/null @@ -1,8 +0,0 @@ -local status, lsp_installer = pcall(require,"nvim-lsp-installer") -if (not status) then return end - -lsp_installer.on_server_ready(function(server) - local opts = {} - - server:setup(opts) -end) diff --git a/lua/lsp/metals.lua b/lua/lsp/metals.lua deleted file mode 100644 index a9a4143..0000000 --- a/lua/lsp/metals.lua +++ /dev/null @@ -1,46 +0,0 @@ -local status, metals = pcall(require, "metals") -if (not status) then return function() end end - -return function(on_attach) - metals_config = metals.bare_config() - metals_config.init_options.statusBarProvider = "on" - metals_config.settings = { - showImplicitArguments = true, - superMethodLensesEnabled = true, - } - metals_config.on_attach = function(client, bufnr) - require("metals").setup_dap() - on_attach(client, bufnr) - end - metals_config.capabilities = require("cmp_nvim_lsp").default_capabilities() - -- Debug settings if you're using nvim-dap - local dap = require("dap") - dap.configurations.scala = { - { - type = "scala", - request = "launch", - name = "RunOrTest", - metals = { - runType = "runOrTestFile", - --args = { "firstArg", "secondArg", "thirdArg" }, -- here just as an example - }, - }, - { - type = "scala", - request = "launch", - name = "Test Target", - metals = { - runType = "testTarget", - }, - }, - } - - - vim.cmd [[augroup lsp]] - vim.cmd [[au!]] - vim.cmd([[autocmd FileType scala setlocal omnifunc=v:lua.vim.lsp.omnifunc]]) - vim.cmd [[au FileType scala,sbt lua require("metals").initialize_or_attach(metals_config)]] - vim.cmd [[augroup end]] - - return metals_config -end diff --git a/lua/lsp/typescript.lua b/lua/lsp/typescript.lua deleted file mode 100644 index 560a7fe..0000000 --- a/lua/lsp/typescript.lua +++ /dev/null @@ -1,13 +0,0 @@ -local status, nvim_lsp = pcall(require, "lspconfig") -if (not status) then return function() end end - -return function(on_attach) - local protocol = require('vim.lsp.protocol') - - -- TypeScript - nvim_lsp.tsserver.setup { - on_attach = on_attach, - filetypes = { "typescript", "typescriptreact", "typescript.tsx" }, - cmd = { "typescript-language-server", "--stdio" } - } -end diff --git a/lua/lsputils.lua b/lua/lsputils.lua deleted file mode 100644 index 765578b..0000000 --- a/lua/lsputils.lua +++ /dev/null @@ -1,44 +0,0 @@ -if vim.fn.has('nvim-0.5.1') == 1 then - vim.lsp.handlers['textDocument/codeAction'] = require'lsputil.codeAction'.code_action_handler - vim.lsp.handlers['textDocument/references'] = require'lsputil.locations'.references_handler - vim.lsp.handlers['textDocument/definition'] = require'lsputil.locations'.definition_handler - vim.lsp.handlers['textDocument/declaration'] = require'lsputil.locations'.declaration_handler - vim.lsp.handlers['textDocument/typeDefinition'] = require'lsputil.locations'.typeDefinition_handler - vim.lsp.handlers['textDocument/implementation'] = require'lsputil.locations'.implementation_handler - vim.lsp.handlers['textDocument/documentSymbol'] = require'lsputil.symbols'.document_handler - vim.lsp.handlers['workspace/symbol'] = require'lsputil.symbols'.workspace_handler -else - local bufnr = vim.api.nvim_buf_get_number(0) - - vim.lsp.handlers['textDocument/codeAction'] = function(_, _, actions) - require('lsputil.codeAction').code_action_handler(nil, actions, nil, nil, nil) - end - - vim.lsp.handlers['textDocument/references'] = function(_, _, result) - require('lsputil.locations').references_handler(nil, result, { bufnr = bufnr }, nil) - end - - vim.lsp.handlers['textDocument/definition'] = function(_, method, result) - require('lsputil.locations').definition_handler(nil, result, { bufnr = bufnr, method = method }, nil) - end - - vim.lsp.handlers['textDocument/declaration'] = function(_, method, result) - require('lsputil.locations').declaration_handler(nil, result, { bufnr = bufnr, method = method }, nil) - end - - vim.lsp.handlers['textDocument/typeDefinition'] = function(_, method, result) - require('lsputil.locations').typeDefinition_handler(nil, result, { bufnr = bufnr, method = method }, nil) - end - - vim.lsp.handlers['textDocument/implementation'] = function(_, method, result) - require('lsputil.locations').implementation_handler(nil, result, { bufnr = bufnr, method = method }, nil) - end - - vim.lsp.handlers['textDocument/documentSymbol'] = function(_, _, result, _, bufn) - require('lsputil.symbols').document_handler(nil, result, { bufnr = bufn }, nil) - end - - vim.lsp.handlers['textDocument/symbol'] = function(_, _, result, _, bufn) - require('lsputil.symbols').workspace_handler(nil, result, { bufnr = bufn }, nil) - end - end diff --git a/lua/my-lsp.lua b/lua/my-lsp.lua deleted file mode 100644 index e53e3f9..0000000 --- a/lua/my-lsp.lua +++ /dev/null @@ -1,79 +0,0 @@ -local lsp_status = require('lsp-status') - -lsp_status.register_progress() - --- enable snippet support ---local capabilities = vim.lsp.protocol.make_client_capabilities() ---capabilities.textDocument.completion.completionItem.snippetSupport = true ---capabilities.textDocument.completion.completionItem.resolveSupport = { --- properties = { --- 'documentation', --- 'detail', --- 'additionalTextEdits', --- } ---} ---capabilities = vim.tbl_extend('keep', capabilities or {}, lsp_status.capabilities) - --- Use an on_attach function to only map the following keys --- after the language server attaches to the current buffer -local on_attach = function(client, bufnr) - local function buf_set_keymap(...) vim.keymap.set(...) end - local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end - - --Enable completion triggered by - vim.bo[bufnr].omnifunc = 'v:lua.vim.lsp.omnifunc' - - -- Mappings. - local opts = { noremap=true, silent=true, buffer=bufnr } - local loud = { noremap=true, buffer=bufnr } - - -- See `:help vim.lsp.*` for documentation on any of the below functions - buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) - buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) - buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) - buf_set_keymap('v', 'K', 'lua vim.lsp.buf.hover()', opts) - buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) - buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) - buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.code_action()', loud) - buf_set_keymap('n', '', 'lua vim.codelens.run()', loud) - buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) - buf_set_keymap('n', '', 'lua vim.diagnostic.open_float()', opts) - buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', opts) - buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.diagnostic.set_loclist()', opts) - buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", opts) - buf_set_keymap("n", "dc", function() require("dap").continue() end, opts) - buf_set_keymap("n", "dr", function() require("dap").repl.toggle() end, opts) - buf_set_keymap("n", "dK", function() require("dap.ui.widgets").hover() end, opts) - buf_set_keymap("n", "dt", function() require("dap").toggle_breakpoint() end, opts) - buf_set_keymap("n", "dso", function() require("dap").step_over() end, opts) - buf_set_keymap("n", "dsi", function() require("dap").step_into() end, opts) - buf_set_keymap("n", "dl", function() require("dap").run_last() end, opts) - - lsp_status.on_attach(client) - - --require'completion'.on_attach(client, bufnr) -end - -require("lsp.metals")(on_attach) - -require("lsp.typescript")(on_attach) - -vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( - vim.lsp.diagnostic.on_publish_diagnostics, { - virtual_text = false, - underline = true, - signs = true, - } -) - -vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with( - vim.lsp.handlers.signature_help, { - silent = true, focusable = false - } -) - -vim.cmd [[autocmd CursorHoldI * silent! lua vim.lsp.buf.signature_help()]] -vim.cmd [[autocmd CursorHold * lua vim.diagnostic.open_float({max_width = 100, focusable = false})]] diff --git a/lua/plugins/chroma.lua b/lua/plugins/chroma.lua new file mode 100644 index 0000000..562c445 --- /dev/null +++ b/lua/plugins/chroma.lua @@ -0,0 +1,9 @@ +return { + "crater2150/vim-theme-chroma", + lazy = false, + branch = "lush", + priority = 1000, + config = function() + vim.cmd.colorscheme("chroma") + end, +} diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua new file mode 100644 index 0000000..a87a0ff --- /dev/null +++ b/lua/plugins/cmp.lua @@ -0,0 +1,121 @@ +return { + { + "hrsh7th/nvim-cmp", + -- load cmp on InsertEnter + event = "InsertEnter", + -- these dependencies will only be loaded when cmp loads + -- dependencies are always lazy-loaded unless specified otherwise + dependencies = { + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-buffer", + "hrsh7th/cmp-path", + "hrsh7th/cmp-cmdline", + -- 'hrsh7th/cmp-vsnip', + -- 'hrsh7th/vim-vsnip', + -- 'hrsh7th/vim-vsnip-integ', + "L3MON4D3/LuaSnip", + "saadparwaiz1/cmp_luasnip", + "onsails/lspkind.nvim", + { + "zbirenbaum/copilot-cmp", + dependencies = { + "hrsh7th/nvim-cmp", + { + "zbirenbaum/copilot.lua", + opts = { + suggestion = { enabled = false }, + panel = { enabled = false }, + filetypes = { + mail = false, + text = false, + }, + }, + }, + }, + config = function() + require("copilot_cmp").setup() + end, + }, + }, + config = function() + local cmp = require("cmp") + local lspkind = require("lspkind") + local luasnip = require("luasnip") + local has_words_before = function() + unpack = unpack or table.unpack + local line, col = unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 + and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil + end + + cmp.setup({ + snippet = { + expand = function(args) + --vim.fn["vsnip#anonymous"](args.body) + require("luasnip").lsp_expand(args.body) + end, + }, + mapping = { + [""] = cmp.mapping.confirm({ select = true }), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.abort(), + [""] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }), + [""] = cmp.mapping({ + i = function(fallback) + if cmp.visible() and cmp.get_active_entry() then + cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false }) + else + fallback() + end + end, + s = cmp.mapping.confirm({ select = true }), + c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }), + }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable() + -- they way you will only jump inside the snippet region + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + elseif has_words_before() then + cmp.complete() + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + }, + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + { name = "luasnip" }, + { name = "copilot" }, + }, { + { name = "buffer", option = { keyword_pattern = [[\k\+]] } }, + --{ name = 'path' }, + }), + formatting = { + format = lspkind.cmp_format({ + mode = "symbol_text", -- show only symbol annotations + maxwidth = 80, -- prevent the popup from showing more than provided characters (e.g 50 will not show more than 50 characters) + ellipsis_char = "…", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead (must define maxwidth first) + symbol_map = { Copilot = "" }, + }), + }, + }) + end, + }, +} diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua new file mode 100644 index 0000000..cf939f5 --- /dev/null +++ b/lua/plugins/conform.lua @@ -0,0 +1,33 @@ +return { + "stevearc/conform.nvim", + event = { "BufWritePre" }, + cmd = { "ConformInfo" }, + keys = { + { + -- Customize or remove this keymap to your liking + "f", + function() + require("conform").format({ async = true, lsp_fallback = true }) + end, + mode = "", + desc = "Format buffer", + }, + }, + -- Everything in opts will be passed to setup() + opts = { + -- Define your formatters + formatters_by_ft = { + lua = { "stylua" }, + python = { "isort", "black" }, + javascript = { "prettierd", "prettier", stop_after_first = true }, + }, + -- Set up format-on-save + format_on_save = { timeout_ms = 500, lsp_fallback = true }, + -- Customize formatters + formatters = { + shfmt = { + prepend_args = { "-i", "2" }, + }, + }, + }, +} diff --git a/lua/plugins/deepl.lua b/lua/plugins/deepl.lua new file mode 100644 index 0000000..da06b92 --- /dev/null +++ b/lua/plugins/deepl.lua @@ -0,0 +1,29 @@ +return { + "ryicoh/deepl.vim", + keys = { + { + "", + function() + vim.fn["deepl#v"]("EN") + end, + mode = "v", + }, + { + "", + function() + vim.fn["deepl#v"]("DE") + end, + mode = "v", + }, + }, + dependencies = { { + "tsuyoshicho/vim-pass", + init = function() + vim.g.pass_use_agent = 1 + end, + } }, + config = function() + vim.g["deepl#endpoint"] = "https://api-free.deepl.com/v2/translate" + vim.g["deepl#auth_key"] = vim.fn["pass#get"]("web/deepl.com", "apikey") + end, +} diff --git a/lua/plugins/exttools.lua b/lua/plugins/exttools.lua new file mode 100644 index 0000000..c7d513a --- /dev/null +++ b/lua/plugins/exttools.lua @@ -0,0 +1,3 @@ +return { + "mfussenegger/nvim-lint", +} diff --git a/lua/plugins/filetypes.lua b/lua/plugins/filetypes.lua new file mode 100644 index 0000000..a5e5dd3 --- /dev/null +++ b/lua/plugins/filetypes.lua @@ -0,0 +1,5 @@ +return { + { "ledger/vim-ledger", ft = "ledger" }, + { "nfnty/vim-nftables", ft = "nftables" }, + { "jvirtanen/vim-hocon", ft = "hocon" }, +} diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua new file mode 100644 index 0000000..8045e1a --- /dev/null +++ b/lua/plugins/fugitive.lua @@ -0,0 +1 @@ +return { "tpope/vim-fugitive" } diff --git a/lua/plugins/gen.lua b/lua/plugins/gen.lua new file mode 100644 index 0000000..eaabe4c --- /dev/null +++ b/lua/plugins/gen.lua @@ -0,0 +1,11 @@ +return { + "David-Kunz/gen.nvim", + opts = { + model = "mistral", -- The default model to use. + init = false, + }, + cmd = "Gen", + keys = { + { "llm", ":Gen", mode = "n" }, + }, +} diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua new file mode 100644 index 0000000..4551cf6 --- /dev/null +++ b/lua/plugins/git.lua @@ -0,0 +1,14 @@ +return { + "lambdalisue/gina.vim", + "gisphm/vim-gitignore", + "sjl/splice.vim", + { + "lewis6991/gitsigns.nvim", + config = { + signs = { + add = { text = "▌" }, + change = { text = "▐" }, + }, + }, + }, +} diff --git a/lua/plugins/hover.lua b/lua/plugins/hover.lua new file mode 100644 index 0000000..1f88ead --- /dev/null +++ b/lua/plugins/hover.lua @@ -0,0 +1,23 @@ +return { + "lewis6991/hover.nvim", + config = function() + require("hover").setup({ + init = function() + require("hover.providers.lsp") + require("hover.providers.gh") + require("hover.providers.man") + end, + preview_opts = { + border = nil, + }, + -- Whether the contents of a currently open hover window should be moved + -- to a :h preview-window when pressing the hover keymap. + preview_window = false, + title = true, + }) + + -- Setup keymaps + vim.keymap.set("n", "K", require("hover").hover, { desc = "hover.nvim" }) + vim.keymap.set("n", "gK", require("hover").hover_select, { desc = "hover.nvim (select)" }) + end, +} diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua new file mode 100644 index 0000000..fa3cc12 --- /dev/null +++ b/lua/plugins/init.lua @@ -0,0 +1,50 @@ +return { + "pbrisbin/vim-mkdir", + "fladson/vim-kitty", + "tpope/vim-repeat", + "tpope/vim-surround", + "tpope/vim-characterize", + "tpope/vim-commentary", + + { "chrisgrieser/nvim-genghis", dependencies = "stevearc/dressing.nvim" }, + + -- ic / ac + { + "glts/vim-textobj-comment", + dependencies = { "kana/vim-textobj-user" }, + }, + -- ii / ai + "michaeljsmith/vim-indent-object", + "neovim/nvim-lspconfig", + + { + "nvim-telescope/telescope.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + }, + + { + "ray-x/lsp_signature.nvim", + config = function() + require("lsp_signature").setup({}) + end, + }, + "kyazdani42/nvim-web-devicons", + "folke/trouble.nvim", + "folke/lsp-colors.nvim", + "artemave/workspace-diagnostics.nvim", + "nvim-lua/popup.nvim", + { + "junegunn/vim-easy-align", + keys = { { "", "(EasyAlign)", mode = { "n", "x" } } }, + }, + "machakann/vim-highlightedyank", + "lambdalisue/suda.vim", + "jamessan/vim-gnupg", + + --"vim-pandoc/vim-pandoc", + --"vim-pandoc/vim-pandoc-syntax", + "isobit/vim-caddyfile", + "Glench/Vim-Jinja2-Syntax", + "Everduin94/nvim-quick-switcher", +} +-- 'powerman/vim-plugin-AnsiEsc', diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua new file mode 100644 index 0000000..c5be928 --- /dev/null +++ b/lua/plugins/lspconfig.lua @@ -0,0 +1,153 @@ +return { + -- lspconfig + { + "neovim/nvim-lspconfig", + event = { "BufReadPre", "BufNewFile" }, + dependencies = { + { "folke/neoconf.nvim", cmd = "Neoconf", config = true }, + { "folke/neodev.nvim", opts = {} }, + "mason-org/mason.nvim", + "hrsh7th/cmp-nvim-lsp", + }, + ---@class PluginLspOpts + opts = function() + return { + -- options for vim.diagnostic.config() + diagnostics = { + underline = true, + update_in_insert = false, + virtual_text = { + spacing = 4, + source = "if_many", + prefix = "●", + -- this will set set the prefix to a function that returns the diagnostics icon based on the severity + -- this only works on a recent 0.10.0 build. Will be set to "●" when not supported + -- prefix = "icons", + }, + severity_sort = true, + }, + -- add any global capabilities here + capabilities = {}, + servers = { + jsonls = {}, + lua_ls = { + settings = { + Lua = { + workspace = { + checkThirdParty = false, + }, + completion = { + callSnippet = "Replace", + }, + telemetry = { enable = false }, + }, + }, + }, + pylsp = { + settings = { + pylsp = { + plugins = { + rope_autoimport = { enabled = true }, + isort = { enabled = true }, + pycodestyle = { maxLineLength = 120 }, + }, + }, + }, + }, + lemminx = { + settings = { xml = { server = { workDir = "~/.cache/lemminx" } } }, + }, + tinymist = { + --- todo: these configuration from lspconfig maybe broken + single_file_support = true, + root_dir = function() + return vim.fn.getcwd() + end, + --- See [Tinymist Server Configuration](https://github.com/Myriad-Dreamin/tinymist/blob/main/Configuration.md) for references. + settings = { + exportPdf = "onType", + outputPath = "$root/target/$dir/$name", + }, + }, + }, + -- you can do any additional lsp server setup here + -- return true if you don't want this server to be setup with lspconfig + ---@type table + setup = { + -- example to setup with typescript.nvim + -- tsserver = function(_, opts) + -- require("typescript").setup({ server = opts }) + -- return true + -- end, + -- Specify * to use this function as a fallback for any server + -- ["*"] = function(server, opts) end, + }, + } + end, + ---@param opts PluginLspOpts + config = function(_, opts) + -- diagnostics + vim.diagnostic.config(require("common").icons.diagnostics) + + if type(opts.diagnostics.virtual_text) == "table" and opts.diagnostics.virtual_text.prefix == "icons" then + opts.diagnostics.virtual_text.prefix = vim.fn.has("nvim-0.10.0") == 0 and "●" + or function(diagnostic) + local icons = require("common").icons.diagnostics + for d, icon in pairs(icons) do + if diagnostic.severity == vim.diagnostic.severity[d:upper()] then + return icon + end + end + end + end + + vim.diagnostic.config(vim.deepcopy(opts.diagnostics)) + end, + }, + + -- formatters + -- cmdline tools and lsp servers + { + "mason-org/mason.nvim", + cmd = "Mason", + opts = { + ensure_installed = { + "stylua", + "htmlbeautifier", + "prettier", + "prettierd", + "ansible-lint", + "clang-format", + "xmlformatter", + "eslint_d", + }, + }, + }, + "mfussenegger/nvim-jdtls", + { + "mason-org/mason-lspconfig.nvim", + dependencies = { + { "mason-org/mason.nvim", opts = {} }, + "neovim/nvim-lspconfig", + }, + opts = { + ensure_installed = { + "ansiblels", + "cssls", + "eslint", + "html", + "jdtls", + "jsonls", + "lemminx", + "lua_ls", + "openscad_lsp", + "oxlint", + "pylsp", + "somesass_ls", + "tinymist", + "ts_ls", + }, + automatic_installation = true, + }, + }, +} diff --git a/lua/plugins/luadev.lua b/lua/plugins/luadev.lua new file mode 100644 index 0000000..bac9479 --- /dev/null +++ b/lua/plugins/luadev.lua @@ -0,0 +1,3 @@ +return { + "bfredl/nvim-luadev", +} diff --git a/lua/plugins/lush.lua b/lua/plugins/lush.lua new file mode 100644 index 0000000..4b1345b --- /dev/null +++ b/lua/plugins/lush.lua @@ -0,0 +1,11 @@ +return { + "rktjmp/lush.nvim", + cmd = { + "Lushify", + "LushImport", + "LushRunTutorial", + }, + dependencies = { + "rktjmp/shipwright.nvim", + }, +} diff --git a/lua/plugins/markdown.lua b/lua/plugins/markdown.lua new file mode 100644 index 0000000..4666219 --- /dev/null +++ b/lua/plugins/markdown.lua @@ -0,0 +1,7 @@ +return { + "euclio/vim-markdown-composer", + build = "cargo build --release", + enabled = function() + return vim.fn.executable("cargo") + end, +} diff --git a/lua/plugins/metals.lua b/lua/plugins/metals.lua new file mode 100644 index 0000000..cab27e8 --- /dev/null +++ b/lua/plugins/metals.lua @@ -0,0 +1,65 @@ +return { + "scalameta/nvim-metals", + dependencies = { + "nvim-lua/plenary.nvim", + "mfussenegger/nvim-dap", + "hrsh7th/cmp-nvim-lsp", + }, + ft = { "scala", "sbt" }, + config = function() + local metals_config = require("metals").bare_config() + metals_config.init_options.statusBarProvider = "on" + metals_config.settings = { + showImplicitArguments = true, + superMethodLensesEnabled = true, + } + metals_config.on_attach = function(client, bufnr) + require("metals").setup_dap() + end + metals_config.capabilities = require("cmp_nvim_lsp").default_capabilities() + -- Debug settings if you're using nvim-dap + local dap = require("dap") + dap.configurations.scala = { + { + type = "scala", + request = "launch", + name = "RunOrTest", + metals = { + runType = "runOrTestFile", + --args = { "firstArg", "secondArg", "thirdArg" }, -- here just as an example + }, + }, + { + type = "scala", + request = "attach", + buildTarget = "main", + name = "attach to service", + hostName = "localhost", + port = 9999, + }, + { + type = "scala", + request = "launch", + name = "Test Target", + metals = { + runType = "testTarget", + }, + }, + } + + -- Autocmd that will actually be in charging of starting the whole thing + local nvim_metals_group = vim.api.nvim_create_augroup("nvim-metals", { clear = true }) + vim.api.nvim_create_autocmd("FileType", { + -- NOTE: You may or may not want java included here. You will need it if you + -- want basic Java support but it may also conflict if you are using + -- something like nvim-jdtls which also works on a java filetype autocmd. + pattern = { "scala", "sbt" }, + callback = function() + require("metals").initialize_or_attach(metals_config) + end, + group = nvim_metals_group, + }) + + return metals_config + end, +} diff --git a/lua/plugins/tabline.lua b/lua/plugins/tabline.lua new file mode 100644 index 0000000..30beb64 --- /dev/null +++ b/lua/plugins/tabline.lua @@ -0,0 +1,86 @@ +return { + "nvim-lualine/lualine.nvim", + dependencies = { + { "kyazdani42/nvim-web-devicons", lazy = true }, + "crater2150/vim-theme-chroma", + { + "linrongbin16/lsp-progress.nvim", + config = function() + require("lsp-progress").setup() + end, + }, + }, + event = "VeryLazy", + opts = function(_, opts) + return { + options = { + theme = require("chroma-theme.lualine"), + }, + tabline = { + lualine_a = { "branch" }, + lualine_b = {}, + lualine_c = { + { + "buffers", + show_filename_only = false, + symbols = { modified = " ✏️]", alternate_file = " 🔃", folder = " 📁" }, + }, + }, + lualine_x = {}, + lualine_y = {}, + lualine_z = { + { + "tabs", + mode = 1, + fmt = function(name, context) + local buflist = vim.fn.tabpagebuflist(context.tabnr) + local mod = not vim.tbl_isempty(vim.tbl_filter(function(bufnr) + return vim.fn.getbufvar(bufnr, "&mod") == 1 + end, buflist)) + + local wincount = #vim.tbl_filter(function(i) + return i == "leaf" + end, vim.tbl_flatten(vim.fn.winlayout(context.tabnr))) + + return name + .. (wincount > 1 and " +" .. (wincount - 1) or "") + .. (mod and " [✏️]]" or "") + end, + }, + }, + }, + sections = { + lualine_a = { { "filename", path = 1 } }, + lualine_b = { "diff", "diagnostics" }, + lualine_x = { + function() + -- invoke `progress` here. + return require("lsp-progress").progress() + end, + }, + lualine_y = { "filetype" }, + lualine_z = { "searchcount", "selectioncount", "location" }, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { { "filename", path = 1 } }, + lualine_x = { "location" }, + lualine_y = {}, + lualine_z = {}, + }, + winbar = {}, + inactive_winbar = {}, + extensions = {}, + } + end, + config = function(_, opts) + require("lualine").setup(opts) + vim.api.nvim_create_augroup("lualine_augroup", { clear = true }) + vim.api.nvim_create_autocmd("User", { + group = "lualine_augroup", + pattern = "LspProgressStatusUpdated", + callback = require("lualine").refresh, + }) + end, +} diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua new file mode 100644 index 0000000..7998fe4 --- /dev/null +++ b/lua/plugins/telescope.lua @@ -0,0 +1,61 @@ +return { + "nvim-telescope/telescope.nvim", + dependencies = { + { + "nvim-telescope/telescope-fzf-native.nvim", + build = "cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build", + }, + "gbrlsnchs/telescope-lsp-handlers.nvim", + }, + cmd = "Telescope", + version = false, + keys = function() + local builtin = require("telescope.builtin") + local utils = require("telescope.utils") + -- stylua: ignore start + return { + { + ',,', + function() + builtin.fd { cwd = require("findroot")(utils.buffer_dir()) } + end, + desc = "Find files in base dir (defined by .telescope-root file)" + }, + { ',ff', builtin.fd, desc = "Find files" }, + { ',fg', builtin.git_files, desc = "Find files (git)" }, + { ',gs', builtin.git_status, desc = "Git status" }, + { ',s', builtin.lsp_dynamic_workspace_symbols, desc = "Symbols" }, + { 'g/', builtin.live_grep, desc = "Live grep" }, + { 'g:', builtin.command_history, desc = "Command history" }, + { '', builtin.current_buffer_fuzzy_find, desc = "Fuzzy find" }, + { '*', builtin.grep_string, desc = "Find at cursor" }, + { 'gb', builtin.buffers, desc = "Switch buffer" }, + { ":", builtin.command_history, desc = "Command History" }, + { ";", builtin.commands, desc = "Commands" }, + { '""', builtin.registers, desc = "Registers" }, + } + end, + --stylua: ignore end + opts = { + defaults = { + prompt_prefix = " ", + selection_caret = " ", + }, + extensions = { + fzf = { + fuzzy = true, + override_generic_sorter = true, + override_file_sorter = true, + case_mode = "smart_case", + }, + ["ui-select"] = { + require("telescope.themes").get_dropdown({}), + }, + }, + }, + config = function(_, opts) + local telescope = require("telescope") + telescope.setup(opts) + telescope.load_extension("fzf") + end, +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua new file mode 100644 index 0000000..a85d4c3 --- /dev/null +++ b/lua/plugins/treesitter.lua @@ -0,0 +1,148 @@ +local function ts_disable(_, bufnr) + return vim.api.nvim_buf_line_count(bufnr) > 5000 +end + +return { + { + "nvim-treesitter/nvim-treesitter", + version = false, + build = ":TSUpdate", + event = { "BufReadPost", "BufNewFile" }, + dependencies = { + { + "nvim-treesitter/nvim-treesitter-textobjects", + init = function() + -- PERF: no need to load the plugin, if we only need its queries for mini.ai + local plugin = require("lazy.core.config").spec.plugins["nvim-treesitter"] + local opts = require("lazy.core.plugin").values(plugin, "opts", false) + local enabled = false + if opts.textobjects then + for _, mod in ipairs({ "move", "select", "swap", "lsp_interop" }) do + if opts.textobjects[mod] and opts.textobjects[mod].enable then + enabled = true + break + end + end + end + if not enabled then + require("lazy.core.loader").disable_rtp_plugin("nvim-treesitter-textobjects") + end + end, + }, + }, + keys = { + { "", desc = "Increment selection" }, + { "", desc = "Decrement selection", mode = "x" }, + }, + opts = { + auto_install = true, + ignore_install = {}, + highlight = { enable = true, disable = ts_disable }, + indent = { enable = true }, + ensure_installed = { + "bash", + "gitignore", + "html", + "java", + "json", + "lua", + "luadoc", + "luap", + "markdown", + "markdown_inline", + "python", + "query", + "regex", + "scala", + "tsx", + "typescript", + "vim", + "vimdoc", + "yaml", + }, + incremental_selection = { + enable = true, + keymaps = { + init_selection = "", + node_incremental = "", + scope_incremental = false, + node_decremental = "", + }, + }, + textobjects = { + select = { + enable = true, + lookahead = true, + keymaps = { + -- stylua: ignore start + ["af"] = { query = "@function.outer", desc = "outer function" }, + ["if"] = { query = "@function.inner", desc = "inner function" }, + ["ac"] = { query = "@class.outer", desc = "outer class" }, + ["ic"] = { query = "@class.inner", desc = "inner class" }, + ["ap"] = { query = "@parameter.outer", desc = "outer parameter" }, + ["ip"] = { query = "@parameter.inner", desc = "inner parameter" }, + ["ar"] = { query = "@return_type.outer", desc = "outer return type" }, + ["ir"] = { query = "@return_type.inner", desc = "inner return type" }, + -- stylua: ignore end + }, + selection_modes = { + ["@parameter.outer"] = "v", -- charwise + ["@function.outer"] = "V", -- linewise + ["@class.outer"] = "V", + }, + }, + swap = { + enable = true, + swap_next = { + ["a"] = "@parameter.inner", + }, + swap_previous = { + ["A"] = "@parameter.inner", + }, + }, + }, + }, + ---@param opts TSConfig + config = function(_, opts) + if type(opts.ensure_installed) == "table" then + ---@type table + local added = {} + opts.ensure_installed = vim.tbl_filter(function(lang) + if added[lang] then + return false + end + added[lang] = true + return true + end, opts.ensure_installed --[[@as string[] ]]) + end + require("nvim-treesitter.configs").setup(opts) + end, + }, + { + "nvim-treesitter/playground", + dependencies = { "nvim-treesitter/nvim-treesitter" }, + cmd = { + "TSPlaygroundToggle", + "TSHighlightCapturesUnderCursor", + "TSNodeUnderCursor", + }, + }, + { + "nvim-treesitter/nvim-treesitter-context", + event = "VeryLazy", + dependencies = { "nvim-treesitter/nvim-treesitter" }, + cmd = { "TSContextEnable", "TSContextDisable", "TSContextToggle" }, + keys = { + -- stylua: ignore start + { "[c", function() require("treesitter-context").go_to_context() end, desc = "Go to context start", }, + { "c", function() require("treesitter-context").toggle() end, desc = "Toggle context view", }, + -- stylua: ignore end + }, + opts = { enable = true }, + config = function(_, opts) + require("treesitter-context").setup(opts) + vim.api.nvim_set_hl(0, "TreesitterContext", { bg = "#555555" }) + vim.api.nvim_set_hl(0, "TreesitterContextLineNumber", { link = "Special" }) + end, + }, +} diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua new file mode 100644 index 0000000..d209a3f --- /dev/null +++ b/lua/plugins/ui.lua @@ -0,0 +1,24 @@ +return { + { + "stevearc/dressing.nvim", + enabled = true, + dependencies = { + --'nvim-telescope/telescope-ui-select.nvim', + }, + opts = { + select = { + backend = { "telescope" }, + }, + }, + }, + { + "lukas-reineke/indent-blankline.nvim", + main = "ibl", + tag = "v3.5.4", + opts = { + whitespace = { highlight = { "Whitespace", "CursorLine" }, remove_blankline_trail = false }, + indent = { highlight = { "Whitespace", "CursorLine" }, char = "" }, + scope = { enabled = true }, + }, + }, +} diff --git a/lua/plugins/vimtex.lua b/lua/plugins/vimtex.lua new file mode 100644 index 0000000..a0850cd --- /dev/null +++ b/lua/plugins/vimtex.lua @@ -0,0 +1,10 @@ +return { + "lervag/vimtex", + init = function() + vim.g.tex_flavor = "latex" + vim.g.tex_conceal = "agm" + vim.g.vimtex_quickfix_ignorefilters = { "overfull", "underfull" } + vim.g.vimtex_syntax_enabled = 0 + end, + ft = "tex", +} diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua new file mode 100644 index 0000000..183fcb3 --- /dev/null +++ b/lua/plugins/which-key.lua @@ -0,0 +1,9 @@ +return { + "folke/which-key.nvim", + event = "VeryLazy", + init = function() + vim.o.timeout = true + vim.o.timeoutlen = 300 + end, + opts = {}, +} diff --git a/packages.vim b/packages.vim deleted file mode 100644 index 28c9ceb..0000000 --- a/packages.vim +++ /dev/null @@ -1,118 +0,0 @@ -call plug#begin(expand(':p:h') . '/plugged') - -" basic stuff -Plug 'pbrisbin/vim-mkdir' -Plug 'embear/vim-localvimrc' - -Plug 'crater2150/vim-theme-chroma' -"Plug '~/sources/chroma-colors/vim' -Plug 'fladson/vim-kitty' - -" generic -Plug 'ryicoh/deepl.vim' - -" tim pope stuff -Plug 'tpope/vim-repeat' " . for commands from plugins -Plug 'tpope/vim-surround' " add/remove braces,quotes,... -Plug 'tpope/vim-characterize' " More info in ga output -Plug 'tpope/vim-eunuch' " :Delete, :Move, etc. -Plug 'tpope/vim-commentary' " gc operator -Plug 'tpope/vim-sleuth' " detect shiftwidth/expandtab -" -" motions and textobjects -Plug 'kana/vim-textobj-user' | Plug 'glts/vim-textobj-comment' " ic / ac -Plug 'michaeljsmith/vim-indent-object' -Plug 'vim-scripts/argtextobj.vim' - -Plug 'airblade/vim-gitgutter' - -" LSP -Plug 'neovim/nvim-lspconfig' -Plug 'hrsh7th/cmp-buffer' -Plug 'hrsh7th/cmp-nvim-lsp' -Plug 'hrsh7th/cmp-path' -Plug 'hrsh7th/cmp-vsnip' -Plug 'hrsh7th/nvim-cmp' -Plug 'hrsh7th/vim-vsnip' -Plug 'hrsh7th/vim-vsnip-integ' -Plug 'nvim-lua/plenary.nvim' -Plug 'scalameta/nvim-metals' -Plug 'williamboman/nvim-lsp-installer' - -Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} -Plug 'nvim-lua/lsp-status.nvim' -Plug 'RishabhRD/popfix' -Plug 'RishabhRD/nvim-lsputils' -Plug 'kyazdani42/nvim-web-devicons' -Plug 'folke/trouble.nvim' -Plug 'folke/lsp-colors.nvim' -Plug 'nvim-lua/popup.nvim' -Plug 'nvim-lua/plenary.nvim' -Plug 'nvim-telescope/telescope.nvim' -Plug 'nvim-telescope/telescope-fzf-native.nvim', { 'do': 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' } -Plug 'gbrlsnchs/telescope-lsp-handlers.nvim' - -Plug 'mfussenegger/nvim-dap' - - -Plug 'machakann/vim-highlightedyank' - -Plug 'junegunn/vim-easy-align' - -" for stuff installed via disto package manager, e.g. fzf's bundled vim plugin -Plug '/usr/share/vim/vimfiles' -Plug 'junegunn/fzf.vim' - -Plug 'vim-airline/vim-airline' -Plug 'lambdalisue/suda.vim' - -Plug 'vim-scripts/SyntaxRange' - -Plug 'lukas-reineke/indent-blankline.nvim' - -" ruby -Plug 'depuracao/vim-rdoc' -Plug 'vim-ruby/vim-ruby' -Plug 'tpope/vim-rails' -Plug 'tpope/vim-rake' - -" git -Plug 'lambdalisue/gina.vim' -Plug 'gregsexton/gitv' -Plug 'gisphm/vim-gitignore' -Plug 'sjl/splice.vim' - - -" other filetype specific plugins -Plug 'jamessan/vim-gnupg' -let g:no_cecutil_maps = 1 -Plug 'powerman/vim-plugin-AnsiEsc' -Plug 'tpope/vim-markdown' -Plug 'lervag/vimtex' -" let g:vimtex_compiler_method = 'arara' -Plug 'ledger/vim-ledger' -Plug 'anekos/hledger-vim' -Plug 'elzr/vim-json' -Plug 'kchmck/vim-coffee-script' -Plug 'gre/play2vim' -Plug 'isobit/vim-caddyfile' -Plug 'vim-pandoc/vim-pandoc' -Plug 'vim-pandoc/vim-pandoc-syntax' -Plug 'GEverding/vim-hocon' -Plug 'nfnty/vim-nftables' - -function! BuildComposer(info) - if a:info.status != 'unchanged' || a:info.force - if has('nvim') - !cargo build --release - else - !cargo build --release --no-default-features --features json-rpc - endif - endif -endfunction - -Plug 'euclio/vim-markdown-composer', { 'do': function('BuildComposer') } - -call plug#end() - -" vim:ft=vim foldmethod=marker diff --git a/plugin/ansible-ftdetect.vim b/plugin/ansible-ftdetect.vim new file mode 100644 index 0000000..cb4486f --- /dev/null +++ b/plugin/ansible-ftdetect.vim @@ -0,0 +1 @@ +au BufRead,BufNewFile */ansible-playbooks/*.yml set filetype=yaml.ansible diff --git a/plugin/centerscroll.lua b/plugin/centerscroll.lua new file mode 100644 index 0000000..861d879 --- /dev/null +++ b/plugin/centerscroll.lua @@ -0,0 +1,16 @@ +-- " from https://vi.stackexchange.com/a/26055 +-- augroup KeepCentered +-- autocmd! +-- autocmd CursorMoved * if &buftype == '' | normal! zz | endif +-- augroup END + +vim.api.nvim_create_augroup("KeepCentered", { clear = true }) +vim.api.nvim_create_autocmd("CursorMoved", { + group = "KeepCentered", + pattern = "*", + callback = function() + if vim.o.buftype == "" then + vim.cmd([[normal! zz]]) + end + end, +}) diff --git a/plugin/on-attach.lua b/plugin/on-attach.lua new file mode 100644 index 0000000..3d52187 --- /dev/null +++ b/plugin/on-attach.lua @@ -0,0 +1,64 @@ +local on_attach = function(args) + local client = vim.lsp.get_client_by_id(args.data.client_id) + if client.server_capabilities.completionProvider then + --Enable completion triggered by + vim.bo[args.buf].omnifunc = "v:lua.vim.lsp.omnifunc" + end + if client.server_capabilities.definitionProvider then + vim.bo[args.buf].tagfunc = "v:lua.vim.lsp.tagfunc" + end + -- + + local function diag_jump(count) + return function() + vim.diagnostic.jump({ count = count, float = true }) + end + end + + -- Mappings. + -- stylua: ignore start + for _, mapping in ipairs({ + { 'gD', vim.lsp.buf.declaration, "Go to declaration" }, + { 'gd', require('telescope.builtin').lsp_definitions, "Go to definition" }, + { 'gi', vim.lsp.buf.implementation, "Go to implementation" }, + { '', vim.lsp.buf.signature_help, "Show signature help" }, + { 'D', vim.lsp.buf.type_definition, "Go to type definition" }, + { 'rn', vim.lsp.buf.rename, "Rename" }, + { '', vim.lsp.buf.code_action, "Code action" }, + { '', vim.lsp.codelens.run, "Run code lens" }, + { 'gr', function() require('telescope.builtin').lsp_references() end,"Go to references" }, + { '', vim.diagnostic.open_float, "Open diagnostics" }, + { '[d', diag_jump(-1), "Go to previous diagnostic" }, + { ']d', diag_jump(1), "Go to next diagnostic" }, + { '', diag_jump(1), "Go to next diagnostic" }, + { '', vim.diagnostic.setloclist, "Add buffer diagnostics to location list" }, + { "dc", function() require("dap").continue() end, "Debug: Continue" }, + { "dK", function() require("dap.ui.widgets").hover() end, "Debug: Hover" }, + { "dt", function() require("dap").toggle_breakpoint() end, "Debug: Toggle breakpoint" }, + { "dso", function() require("dap").step_over() end, "Debug: Step over" }, + { "dsi", function() require("dap").step_into() end, "Debug: Step into" }, + { "dl", function() require("dap").run_last() end, "Debug: Run last" }, + { "", function() require("dap").continue() end, "Debug: Continue" }, + { "", function() require("dap.ui.widgets").hover() end, "Debug: Hover" }, + { "", function() require("dap").step_over() end, "Debug: Step over" }, + { "", function() require("dap").step_into() end, "Debug: Step into" }, + { "aa", vim.diagnostic.setqflist, "Add all diagnostics to quickfix list" }, + { "aw", function() vim.diagnostic.setqflist({ severity = "W" }) end, "Add all warnings to quickfix list" }, + { "ae", function() vim.diagnostic.setqflist({ severity = "E" }) end, "Add all errors to quickfix list" }, + }) do + vim.keymap.set("n", mapping[1], mapping[2], { silent = true, buffer = args.buf, desc = mapping[3] }) + end + -- stylua: ignore end + + vim.keymap.set("n", "dr", function() + require("dap").repl.toggle() + end, { silent = true, desc = "Toogle debug REPL" }) + + if client.server_capabilities.documentHighlightingProvider then + vim.cmd([[autocmd CursorHold lua vim.lsp.buf.document_highlight()]]) + vim.cmd([[autocmd CursorHoldI lua vim.lsp.buf.document_highlight()]]) + vim.cmd([[autocmd CursorMoved lua vim.lsp.buf.clear_references()]]) + end +end + +vim.api.nvim_create_autocmd("LspAttach", { callback = on_attach }) diff --git a/plugin/osc52.lua b/plugin/osc52.lua new file mode 100644 index 0000000..fd032cc --- /dev/null +++ b/plugin/osc52.lua @@ -0,0 +1,11 @@ +vim.g.clipboard = { + name = "OSC 52", + copy = { + ["+"] = require("vim.ui.clipboard.osc52").copy("+"), + ["*"] = require("vim.ui.clipboard.osc52").copy("*"), + }, + paste = { + ["+"] = require("vim.ui.clipboard.osc52").paste("+"), + ["*"] = require("vim.ui.clipboard.osc52").paste("*"), + }, +} diff --git a/plugin/scaladeps.lua b/plugin/scaladeps.lua new file mode 100644 index 0000000..21d1f5b --- /dev/null +++ b/plugin/scaladeps.lua @@ -0,0 +1,11 @@ +local sbtToScalaCLI = function() + vim.cmd([[s/\s*libraryDependencies\s*+=\s*/\/\/> using dep /]]) + vim.cmd([[s/" \(%\+\) "/\=repeat(":", strlen(submatch(1)))/g]]) +end + +vim.keymap.set( + "n", + "dep", + sbtToScalaCLI, + { noremap = true, silent = true, desc = "Convert sbt dependency to Scala CLI" } +) diff --git a/syntax/tolua.vim b/syntax/tolua.vim deleted file mode 100644 index 33c1ced..0000000 --- a/syntax/tolua.vim +++ /dev/null @@ -1,41 +0,0 @@ -if exists("b:current_syntax") - finish -endif - -syn include @EmbeddedLua syntax/lua.vim -syn include @EmbeddedPreproc syntax/c.vim - -syn match toluaString "\".*\"" -syn match toluaInclude "<.*>" -syn region toluaEmbeddedLua matchgroup=toluaEmbeddedDelimiter - \ start="^\$\[" end="^\$\]" contains=@EmbeddedLua -syn match toluaCInclude "^\$#.*$" contains=toluaString,toluaInclude - -syn keyword toluaStatement module nextgroup=toluaModuleName skipwhite -syn match toluaModuleName "[_a-zA-Z]\+" contained - -syn match toluaRename "@ [_a-zA-Z]\+" - -" from c syntax file -syn keyword cType int long short char void -syn keyword cType signed unsigned float double -syn keyword luaState lua_State - -syn region cComment matchgroup=cCommentStart start="/\*" end="\*/" contains=@cCommentGroup,cCommentStartError,cCommentString,cCharacter,cNumbersCom,cSpaceError,@Spell extend -syn region cComment matchgroup=cCommentStart start="/\*" end="\*/" contains=@cCommentGroup,cCommentStartError,cSpaceError,@Spell extend -syn keyword cStructure struct union enum typedef -syn keyword cStorageClass static register auto volatile extern const - -let b:current_syntax = "tolua" - -hi def link toluaEmbeddedDelimiter Special -hi def link toluaCInclude PreProc -hi def link toluaString String -hi def link toluaInclude String -hi def link toluaStatement Statement -hi def link toluaModuleName Identifier -hi def link toluaRename Special -hi def link cType Type -hi def link luaState Type -hi def link cStorageClass StorageClass -hi def link cStructure Structure diff --git a/syntax/rdf-turtle.vim b/syntax/turtle.vim similarity index 100% rename from syntax/rdf-turtle.vim rename to syntax/turtle.vim diff --git a/syntax/vtt.vim b/syntax/vtt.vim new file mode 100644 index 0000000..0ad221d --- /dev/null +++ b/syntax/vtt.vim @@ -0,0 +1,25 @@ +" Vim syntax file +" Language: Web Video Text Tracks Format (VTT) +" Filenames: *.vtt +" Vim syntax file +" SeeAlso: +" Maintainer: Alexander Gehrke +" Created: 2023-12-19 + +if version < 600 + syntax clear +elseif exists("b:current_syntax") + finish +endif + +syn region vttComment start="^NOTE .*" end="^$" +syn match vttTimings "\d\{2}:\d\{2}\.\d\{3}" +syn match vttArrow "-->" +syn keyword vttHeader WEBVTT + +hi def link vttTimings Number +hi def link vttArrow Special +hi def link vttComment Comment +hi def link vttHeader Keyword + +let b:current_syntax = "vtt"