diff --git a/.config/coc/extensions/package.json b/.config/coc/extensions/package.json index d227cb2..665cc91 100644 --- a/.config/coc/extensions/package.json +++ b/.config/coc/extensions/package.json @@ -1,8 +1,9 @@ { "dependencies": { - "coc-go": ">=0.6.2", + "coc-go": ">=0.9.2", "coc-json": ">=1.2.6", "coc-python": ">=1.2.12", - "coc-snippets": ">=2.1.26" + "coc-snippets": ">=2.2.1", + "coc-solargraph": ">=1.1.6" } } \ No newline at end of file diff --git a/.vim/coc-settings.json b/.vim/coc-settings.json index 3000f03..15683c5 100644 --- a/.vim/coc-settings.json +++ b/.vim/coc-settings.json @@ -3,6 +3,8 @@ "suggest.enablePreview": true, "suggest.enablePreselect": false, "suggest.noselect": true, + + //"solargraph.useBundler": true, "diagnostic.displayByAle": false, "diagnostic.checkCurrentLine": true, "python.linting.pylintEnabled": false, @@ -25,11 +27,11 @@ } } }, - "golang": { - "command": "gopls", - "rootPatterns": ["go.mod", ".vim/", ".git/", ".hg/"], - "filetypes": ["go"] - } +// "golang": { + // "command": "gopls", + // "rootPatterns": ["go.mod", ".vim/", ".git/", ".hg/"], + // "filetypes": ["go"] + //} }, "python.autoComplete.extraPaths": [ "${env:SPARK_HOME}/python", diff --git a/.vim/colors/baraknew.vim b/.vim/colors/baraknew.vim index 93c7304..632cedd 100644 --- a/.vim/colors/baraknew.vim +++ b/.vim/colors/baraknew.vim @@ -38,7 +38,7 @@ hi Normal ctermfg=253 ctermbg=NONE " ------------- " any comment hi Comment guifg=#238e23 gui=italic -hi Comment ctermfg=34 cterm=none +hi Comment ctermfg=34 cterm=italic " Constant Group diff --git a/.vim/plugin/supertab.vim b/.vim/plugin/supertab.vim deleted file mode 100644 index cda61bd..0000000 --- a/.vim/plugin/supertab.vim +++ /dev/null @@ -1,501 +0,0 @@ -" Author: -" Original: Gergely Kontra -" Current: Eric Van Dewoestine (as of version 0.4) -" Please direct all correspondence to Eric. -" Version: 0.51 -" -" Description: {{{ -" Use your tab key to do all your completion in insert mode! -" You can cycle forward and backward with the and keys -" Note: you must press once to be able to cycle back -" -" http://www.vim.org/scripts/script.php?script_id=1643 -" }}} -" -" License: {{{ -" Software License Agreement (BSD License) -" -" Copyright (c) 2002 - 2009 -" All rights reserved. -" -" Redistribution and use of this software in source and binary forms, with -" or without modification, are permitted provided that the following -" conditions are met: -" -" * Redistributions of source code must retain the above -" copyright notice, this list of conditions and the -" following disclaimer. -" -" * Redistributions in binary form must reproduce the above -" copyright notice, this list of conditions and the -" following disclaimer in the documentation and/or other -" materials provided with the distribution. -" -" * Neither the name of Gergely Kontra or Eric Van Dewoestine nor the names -" of its contributors may be used to endorse or promote products derived -" from this software without specific prior written permission of Gergely -" Kontra or Eric Van Dewoestine. -" -" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -" IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -" THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -" CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -" PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -" LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -" }}} -" -" Testing Info: {{{ -" Running vim + supertab with the absolute bar minimum settings: -" $ vim -u NONE -U NONE -c "set nocp | runtime plugin/supertab.vim" -" }}} - -if v:version < 700 - finish -endif - -if exists('complType') " Integration with other completion functions. - finish -endif - -" Global Variables {{{ - - " Used to set the default completion type. - " There is no need to escape this value as that will be done for you when - " the type is set. - " Ex. let g:SuperTabDefaultCompletionType = "" - " - " Note that a special value of 'context' is supported which will result in - " super tab attempting to use the text preceding the cursor to decide which - " type of completion to attempt. Currently super tab can recognize method - " calls or attribute references via '.', '::' or '->', and file path - " references containing '/'. - " Ex. let g:SuperTabDefaultCompletionType = 'context' - " /usr/l # will use filename completion - " myvar.t # will use user completion if completefunc set, or omni - " # completion if omnifunc set. - " myvar-> # same as above - " - " When using context completion, super tab will fall back to a secondary - " default completion type set by g:SuperTabContextDefaultCompletionType. - if !exists("g:SuperTabDefaultCompletionType") - let g:SuperTabDefaultCompletionType = "" - endif - - " Sets the default completion type used when g:SuperTabDefaultCompletionType - " is set to 'context' and the text preceding the cursor does not match any - " patterns mapped to other specific completion types. - if !exists("g:SuperTabContextDefaultCompletionType") - let g:SuperTabContextDefaultCompletionType = "" - endif - - " When 'context' completion is enabled, this setting can be used to fallback - " to g:SuperTabContextDefaultCompletionType as the default for files whose - " file type occurs in this configured list. This allows you to provide an - " exclusion for which 'context' completion is not activated. - if !exists("g:SuperTabContextFileTypeExclusions") - let g:SuperTabContextFileTypeExclusions = [] - endif - - " Used to set a list of variable, completion type pairs used to determine - " the default completion type to use for the current buffer. If the - " variable is non-zero and non-empty then the associated completion type - " will be used. - " Ex. To use omni or user completion when available, but fall back to the - " global default otherwise: - " let g:SuperTabDefaultCompletionTypeDiscovery = [ - " \ "&completefunc:", - " \ "&omnifunc:", - " \ ] - if !exists("g:SuperTabDefaultCompletionTypeDiscovery") - let g:SuperTabDefaultCompletionTypeDiscovery = [] - endif - - " Determines if, and for how long, the current completion type is retained. - " The possible values include: - " 0 - The current completion type is only retained for the current completion. - " Once you have chosen a completion result or exited the completion - " mode, the default completion type is restored. - " 1 - The current completion type is saved for the duration of your vim - " session or until you enter a different completion mode. - " (SuperTab default). - " 2 - The current completion type is saved until you exit insert mode (via - " ESC). Once you exit insert mode the default completion type is - " restored. - if !exists("g:SuperTabRetainCompletionType") - let g:SuperTabRetainCompletionType = 1 - endif - - " Sets whether or not mid word completion is enabled. - " When enabled, will kick off completion when ever a word character is - " to the left of the cursor. When disabled, completion will only occur if - " the char to the left is a word char and the char to the right is not (you - " are at the end of the word). - if !exists("g:SuperTabMidWordCompletion") - let g:SuperTabMidWordCompletion = 1 - endif - - " The following two variables allow you to set the key mapping used to kick - " off the current completion. By default this is and . To - " change to something like and , you can add the - " following to your vimrc. - " - " let g:SuperTabMappingForward = '' - " let g:SuperTabMappingBackward = '' - " - " Note: if the above does not have the desired effect (which may happen in - " console version of vim), you can try the following mappings. Although the - " backwards mapping still doesn't seem to work in the console for me, your - " milage may vary. - " - " let g:SuperTabMappingForward = '' - " let g:SuperTabMappingBackward = '' - " - if !exists("g:SuperTabMappingForward") - let g:SuperTabMappingForward = '' - endif - if !exists("g:SuperTabMappingBackward") - let g:SuperTabMappingBackward = '' - endif - - " Sets the key mapping used to insert a literal tab where supertab would - " otherwise attempt to kick off insert completion. - " The default is '' (ctrl-tab) which unfortunately might not work at - " the console. So if you are using a console vim and want this - " functionality, you'll have to change it to something that is supported. - if !exists("g:SuperTabMappingTabLiteral") - let g:SuperTabMappingTabLiteral = '' - endif - - " Sets whether or not to pre-highlight first match when completeopt has - " the popup menu enabled and the 'longest' option as well. - " When enabled, will kick off completion and pre-select the first - " entry in the popup menu, allowing you to simply hit to use it. - if !exists("g:SuperTabLongestHighlight") - let g:SuperTabLongestHighlight = 0 - endif - -" }}} - -" Script Variables {{{ - - " construct the help text. - let s:tabHelp = - \ "Hit or CTRL-] on the completion type you wish to switch to.\n" . - \ "Use :help ins-completion for more information.\n" . - \ "\n" . - \ "|| - Keywords in 'complete' searching down.\n" . - \ "|| - Keywords in 'complete' searching up (SuperTab default).\n" . - \ "|| - Whole lines.\n" . - \ "|| - Keywords in current file.\n" . - \ "|| - Keywords in 'dictionary'.\n" . - \ "|| - Keywords in 'thesaurus', thesaurus-style.\n" . - \ "|| - Keywords in the current and included files.\n" . - \ "|| - Tags.\n" . - \ "|| - File names.\n" . - \ "|| - Definitions or macros.\n" . - \ "|| - Vim command-line.\n" . - \ "|| - User defined completion.\n" . - \ "|| - Omni completion.\n" . - \ "|s| - Spelling suggestions." - - " set the available completion types and modes. - let s:types = - \ "\\\\\\\\" . - \ "\\\\\\\\\s" - let s:modes = '/^E/^Y/^L/^N/^K/^T/^I/^]/^F/^D/^V/^P/^U/^O/s' - let s:types = s:types . "np" - let s:modes = s:modes . '/n/p' - -" }}} - -" CtrlXPP() {{{ -" Handles entrance into completion mode. -function! CtrlXPP() - if &smd - echo '' | echo '-- ^X++ mode (' . s:modes . ')' - endif - let complType = nr2char(getchar()) - if stridx(s:types, complType) != -1 - if stridx("\\", complType) != -1 " no memory, just scroll... - return "\" . complType - elseif stridx('np', complType) != -1 - let complType = nr2char(char2nr(complType) - 96) - else - let complType = "\" . complType - endif - - if g:SuperTabRetainCompletionType - let b:complType = complType - endif - - " Hack to workaround appent bug when invoking command line completion via - " = - if complType == "\\" - return s:CommandLineCompletion() - endif - - return complType - endif - - echohl "Unknown mode" - return complType -endfunction " }}} - -" SuperTabSetCompletionType(type) {{{ -" Globally available function that user's can use to create mappings to -" quickly switch completion modes. Useful when a user wants to restore the -" default or switch to another mode without having to kick off a completion -" of that type or use SuperTabHelp. -" Example mapping to restore SuperTab default: -" nmap :call SetSuperTabCompletionType("") -function! SuperTabSetCompletionType(type) - exec "let b:complType = \"" . escape(a:type, '<') . "\"" -endfunction " }}} - -" s:Init {{{ -" Global initilization when supertab is loaded. -function! s:Init() - augroup supertab_init - autocmd! - autocmd BufEnter * call InitBuffer() - augroup END - - " ensure InitBuffer gets called for the first buffer, after the ftplugins - " have been called. - augroup supertab_init_first - autocmd! - autocmd FileType call InitBuffer() - augroup END - - " Setup mechanism to restore orignial completion type upon leaving insert - " mode if g:SuperTabRetainCompletionType == 2 - if g:SuperTabRetainCompletionType == 2 - augroup supertab_retain - autocmd! - autocmd InsertLeave * call s:SetDefaultCompletionType() - augroup END - endif -endfunction " }}} - -" s:InitBuffer {{{ -" Per buffer initilization. -function! s:InitBuffer() - if exists("b:complType") - return - endif - - " init hack for workaround. - let b:complCommandLine = 0 - - if !exists("b:SuperTabDefaultCompletionType") - " loop through discovery list to find the default - if !empty(g:SuperTabDefaultCompletionTypeDiscovery) - " backward compatiability with old string value. - if type(g:SuperTabDefaultCompletionTypeDiscovery) == 1 - let dlist = split(g:SuperTabDefaultCompletionTypeDiscovery, ',') - else - let dlist = g:SuperTabDefaultCompletionTypeDiscovery - endif - for pair in dlist - let var = substitute(pair, '\(.*\):.*', '\1', '') - let type = substitute(pair, '.*:\(.*\)', '\1', '') - exec 'let value = ' . var - if value !~ '^\s*$' && value != '0' - let b:SuperTabDefaultCompletionType = type - break - endif - endfor - endif - - " fallback to configured default. - if !exists("b:SuperTabDefaultCompletionType") - let b:SuperTabDefaultCompletionType = g:SuperTabDefaultCompletionType - endif - endif - - " set the default completion type. - call SuperTabSetCompletionType(b:SuperTabDefaultCompletionType) -endfunction " }}} - -" s:SetCompletionType() {{{ -" Sets the completion type based on what the user has chosen from the help -" buffer. -function! s:SetCompletionType() - let chosen = substitute(getline('.'), '.*|\(.*\)|.*', '\1', '') - if chosen != getline('.') - let winnr = b:winnr - close - exec winnr . 'winc w' - call SuperTabSetCompletionType(chosen) - endif -endfunction " }}} - -" s:SetDefaultCompletionType() {{{ -function! s:SetDefaultCompletionType() - if exists('b:SuperTabDefaultCompletionType') && !b:complCommandLine - call SuperTabSetCompletionType(b:SuperTabDefaultCompletionType) - endif -endfunction " }}} - -" s:SuperTab(command) {{{ -" Used to perform proper cycle navigation as the user requests the next or -" previous entry in a completion list, and determines whether or not to simply -" retain the normal usage of based on the cursor position. -function! s:SuperTab(command) - if s:WillComplete() - " rare case where no autocmds have fired for this buffer to initialize the - " supertab vars. - call s:InitBuffer() - - let key = '' - " highlight first result if longest enabled - if g:SuperTabLongestHighlight && !pumvisible() && &completeopt =~ 'longest' - let key = (b:complType == "\") ? "\" : "\" - endif - - " exception: if in mode, then should move up the list, and - " down the list. - if a:command == 'p' && - \ (b:complType == "\" || - \ (b:complType == 'context' && - \ tolower(g:SuperTabContextDefaultCompletionType) == '')) - return "\" - endif - - if b:complType == 'context' - if index(g:SuperTabContextFileTypeExclusions, &ft) == -1 - let curline = getline('.') - let cnum = col('.') - let synname = synIDattr(synID(line('.'), cnum - 1, 1), 'name') - if curline =~ '.*/\w*\%' . cnum . 'c' || - \ ((has('win32') || has('win64')) && curline =~ '.*\\\w*\%' . cnum . 'c') - return "\\" . key - elseif curline =~ '.*\(\w\|[\])]\)\(\.\|::\|->\)\w*\%' . cnum . 'c' && - \ synname !~ '\(String\|Comment\)' - if &completefunc != '' - return "\\" . key - elseif &omnifunc != '' - return "\\" . key - endif - endif - endif - exec "let complType = \"" . escape(g:SuperTabContextDefaultCompletionType, '<') . "\"" - return complType . key - endif - - " Hack to workaround appent bug when invoking command line completion via - " = - if b:complType == "\\" - return s:CommandLineCompletion() - endif - return b:complType . key - endif - - return "\" -endfunction " }}} - -" s:SuperTabHelp() {{{ -" Opens a help window where the user can choose a completion type to enter. -function! s:SuperTabHelp() - let winnr = winnr() - if bufwinnr("SuperTabHelp") == -1 - botright split SuperTabHelp - - setlocal noswapfile - setlocal buftype=nowrite - setlocal bufhidden=delete - - let saved = @" - let @" = s:tabHelp - silent put - call cursor(1, 1) - silent 1,delete - call cursor(4, 1) - let @" = saved - exec "resize " . line('$') - - syntax match Special "|.\{-}|" - - setlocal readonly - setlocal nomodifiable - - nmap :call SetCompletionType() - nmap :call SetCompletionType() - else - exec bufwinnr("SuperTabHelp") . "winc w" - endif - let b:winnr = winnr -endfunction " }}} - -" s:WillComplete() {{{ -" Determines if completion should be kicked off at the current location. -function! s:WillComplete() - let line = getline('.') - let cnum = col('.') - - " Start of line. - let prev_char = strpart(line, cnum - 2, 1) - if prev_char =~ '^\s*$' - return 0 - endif - - " Within a word, but user does not have mid word completion enabled. - let next_char = strpart(line, cnum - 1, 1) - if !g:SuperTabMidWordCompletion && next_char =~ '\k' - return 0 - endif - - " In keyword completion mode and no preceding word characters. - "if (b:complType == "\" || b:complType == "\") && prev_char !~ '\k' - " return 0 - "endif - - return 1 -endfunction " }}} - -" s:CommandLineCompletion() {{{ -" Hack needed to account for apparent bug in vim command line mode completion -" when invoked via = -function! s:CommandLineCompletion() - " This hack will trigger InsertLeave which will then invoke - " s:SetDefaultCompletionType. To prevent default completion from being - " restored prematurely, set an internal flag for s:SetDefaultCompletionType - " to check for. - let b:complCommandLine = 1 - return "\\:call feedkeys('\\\', 'n') | " . - \ "let b:complCommandLine = 0\" -endfunction " }}} - -" Key Mappings {{{ - " map a regular tab to ctrl-tab (note: doesn't work in console vim) - exec 'inoremap ' . g:SuperTabMappingTabLiteral . ' ' - - imap =CtrlXPP() - - " From the doc |insert.txt| improved - exec 'imap ' . g:SuperTabMappingForward . ' ' - exec 'imap ' . g:SuperTabMappingBackward . ' ' - - " After hitting , hitting it once more will go to next match - " (because in XIM mode and mappings are ignored) - " and wont start a brand new completion - " The side effect, that in the beginning of line and inserts a - " , but I hope it may not be a problem... - inoremap =SuperTab('n') - inoremap =SuperTab('p') -" }}} - -" Command Mappings {{{ - if !exists(":SuperTabHelp") - command SuperTabHelp :call SuperTabHelp() - endif -" }}} - -call s:Init() - -" vim:ft=vim:fdm=marker diff --git a/.vimrc b/.vimrc index 86e36d1..f4854bc 100644 --- a/.vimrc +++ b/.vimrc @@ -85,6 +85,11 @@ if exists('gnvim') set guifont=Droid\ Sans\ Mono\ Dotted:h15 endif +" * Polyglot + +let g:tex_flavor = 'latex' +let g:polyglot_disabled = ['latex'] + " Required: set runtimepath+=/home/barak/.vim/bundle/repos/github.com/Shougo/dein.vim @@ -121,6 +126,7 @@ Plug 'tpope/vim-surround' Plug 'junegunn/vim-easy-align' Plug 'bps/vim-textobj-python' + " Plugins I NEED Plug 'scrooloose/nerdcommenter' "Plug 'sjbach/lusty' @@ -140,6 +146,7 @@ Plug 'tpope/vim-abolish' Plug 'sheerun/vim-polyglot' Plug 'Shougo/denite.nvim' Plug 'plytophogy/vim-virtualenv' +Plug 'ervandew/supertab' " Plugins I NEEDED @@ -212,6 +219,8 @@ nmap gy (coc-type-definition) nmap gi (coc-implementation) nmap gr (coc-references) +imap , (coc-snippets-expand) + " Use K to show documentation in preview window nnoremap K :call show_documentation() @@ -277,6 +286,8 @@ setlocal cursorline " ** PLUGIN CONFIGURATION ** +" * SuperTab +let g:SuperTabDefaultCompletionType = "" " " Change the source rank "call deoplete#custom#option('sources', { @@ -311,8 +322,6 @@ let g:syntastic_auto_loc_list = 2 let g:syntastic_loc_list_height = 10 " E111 = Spaces should be multiples of 4. I use 2. " -" * Polyglot -let g:polyglot_disabled = ['latex'] " * ALE let g:airline#extensions#ale#enabled = 1 @@ -342,12 +351,15 @@ let g:LustyJugglerShowKeys = 'a' let g:buftabs_only_basename = 1 "let g:buftabs_in_statusline=1 -" Bufferline +" * Bufferline let g:bufferline_echo = 0 let g:bufferline_modified = '+' let g:bufferline_show_bufnr = 1 let g:bufferline_rotate = 1 +" * auto-pairs +let g:AutoPairsMultilineClose = 0 + " * NERDTree "let g:NERDChristmasTree = 1 "let g:NERDChristmasTree = 1 @@ -398,7 +410,7 @@ let g:ycm_use_ultisnips_completer = 1 " * UltiSnips let g:UltiSnipsSnippetDirectories=["UltiSnips", "usnips"] -let g:UltiSnipsExpandTrigger="," +"let g:UltiSnipsExpandTrigger="," let g:UltiSnipsJumpForwardTrigger="," let g:UltiSnipsJumpBackwardTrigger=""