diff options
| -rw-r--r-- | vim/.vim/autoload/plug.vim | 2016 | ||||
| -rw-r--r-- | vim/.vim/colors/base16-eighties.vim | 304 | ||||
| -rw-r--r-- | vim/.vim/colors/zenburn.vim | 467 | ||||
| -rw-r--r-- | vim/.vim/ftdetect/pentadactyl.vim | 6 | ||||
| -rw-r--r-- | vim/.vim/ftdetect/robot.vim | 43 | ||||
| -rw-r--r-- | vim/.vim/ftplugin/pentadactyl.vim | 27 | ||||
| -rw-r--r-- | vim/.vim/ftplugin/robot.vim | 100 | ||||
| -rw-r--r-- | vim/.vim/syntax/fsm_syslog.vim | 45 | ||||
| -rw-r--r-- | vim/.vim/syntax/pentadactyl.vim | 133 | ||||
| -rw-r--r-- | vim/.viminfo | 299 | ||||
| -rw-r--r-- | vim/.vimrc | 218 |
11 files changed, 3658 insertions, 0 deletions
diff --git a/vim/.vim/autoload/plug.vim b/vim/.vim/autoload/plug.vim new file mode 100644 index 0000000..8be364c --- /dev/null +++ b/vim/.vim/autoload/plug.vim @@ -0,0 +1,2016 @@ +" 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 +" Plug 'junegunn/seoul256.vim' +" Plug 'junegunn/vim-easy-align' +" +" " Group dependencies, vim-snippets depends on ultisnips +" Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' +" +" " On-demand loading +" Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } +" Plug 'tpope/vim-fireplace', { 'for': 'clojure' } +" +" " Using git URL +" Plug 'https://github.com/junegunn/vim-github-dashboard.git' +" +" " Plugin options +" Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' } +" +" " Plugin outside ~/.vim/plugged with post-update hook +" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' } +" +" " Unmanaged plugin (manually installed and updated) +" Plug '~/my-prototype-plugin' +" +" call plug#end() +" +" Then reload .vimrc and :PlugInstall to install plugins. +" Visit https://github.com/junegunn/vim-plug for more information. +" +" +" Copyright (c) 2015 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') || has('win64') +let s:nvim = has('nvim') && exists('*jobwait') && !s:is_win +let s:me = resolve(expand('<sfile>:p')) +let s:base_spec = { 'branch': 'master', '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! plug#begin(...) + if a:0 > 0 + let s:plug_home_org = a:1 + let home = s:path(fnamemodify(expand(a:1), ':p')) + elseif exists('g:plug_home') + let home = s:path(g:plug_home) + 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 + + 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 s:add(<args>) + if !executable('git') + return s:err('`git` executable not found. vim-plug requires git.') + endif + command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install('<bang>' == '!', [<f-args>]) + command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update('<bang>' == '!', [<f-args>]) + command! -nargs=0 -bar -bang PlugClean call s:clean('<bang>' == '!') + 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 PlugSnapshot call s:snapshot(<f-args>) +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:source(from, ...) + for pattern in a:000 + for vim in s:lines(globpath(a:from, pattern)) + execute 'source' s:esc(vim) + endfor + endfor +endfunction + +function! s:assoc(dict, key, val) + let a:dict[a:key] = add(get(a:dict, a:key, []), a:val) +endfunction + +function! plug#end() + if !exists('g:plugs') + return s:err('Call plug#begin() first') + endif + + if exists('#PlugLOD') + augroup PlugLOD + autocmd! + augroup END + augroup! PlugLOD + endif + let lod = { 'ft': {}, 'map': {}, 'cmd': {} } + + filetype off + for name in g:plugs_order + let plug = g:plugs[name] + if get(s:loaded, name, 0) || !has_key(plug, 'on') && !has_key(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 =~? '^<Plug>.\+' + 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]' + if exists(':'.cmd) != 2 + call s:assoc(lod.cmd, cmd, name) + endif + call add(s:triggers[name].cmd, cmd) + endif + endfor + endif + + if has_key(plug, 'for') + let types = s:to_a(plug.for) + if !empty(types) + call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim') + 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 %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, %s)', + \ cmd, string(cmd), string(names)) + endfor + + for [map, names] in items(lod.map) + for [mode, map_prefix, key_prefix] in + \ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] + execute printf( + \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, "%s")<CR>', + \ mode, map, map_prefix, string(map), string(names), key_prefix) + endfor + endfor + + for [ft, names] in items(lod.ft) + augroup PlugLOD + execute printf('autocmd FileType %s call <SID>lod_ft(%s, %s)', + \ ft, string(ft), string(names)) + augroup END + endfor + + call s:reorg_rtp() + filetype plugin indent on + if has('vim_starting') + syntax enable + else + call s:reload() + endif +endfunction + +function! s:loaded_names() + return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)') +endfunction + +function! s:reload() + for name in s:loaded_names() + call s:source(s:rtp(g:plugs[name]), 'plugin/**/*.vim', 'after/plugin/**/*.vim') + 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(...) + let s:git_version = get(s:, 'git_version', + \ map(split(split(s:system('git --version'))[-1], '\.'), 'str2nr(v:val)')) + 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 + +if s:is_win + function! s:rtp(spec) + return s:path(a:spec.dir . get(a:spec, 'rtp', '')) + endfunction + + 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 +else + function! s:rtp(spec) + return s:dirpath(a:spec.dir . get(a:spec, 'rtp', '')) + endfunction + + 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 a:msg + echohl None + return 0 +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")'), 'isdirectory(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! 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 unknowns = filter(copy(a:000), '!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 + for name in a:000 + call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) + endfor + if exists('#BufRead') + doautocmd BufRead + endif + return 1 +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 exists('#User#'.name) + execute 'doautocmd User' name + endif + endfor +endfunction + +function! s:lod_ft(pat, names) + call s:lod(a:names, ['plugin', 'after/plugin']) + execute 'autocmd! PlugLOD FileType' a:pat + if exists('#filetypeplugin#FileType') + doautocmd filetypeplugin FileType + endif + if exists('#filetypeindent#FileType') + doautocmd filetypeindent FileType + endif +endfunction + +function! s:lod_cmd(cmd, bang, l1, l2, args, names) + call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) + 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, prefix) + call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) + let extra = '' + while 1 + let c = getchar(0) + if c == 0 + break + endif + let extra .= nr2char(c) + endwhile + call feedkeys(a:prefix . substitute(a:map, '^<Plug>', "\<Plug>", '') . extra) +endfunction + +function! s:add(repo, ...) + if a:0 > 1 + return s:err('Invalid number of arguments (1..2)') + endif + + try + let repo = s:trim(a:repo) + let name = fnamemodify(repo, ':t:s?\.git$??') + let spec = extend(s:infer_properties(name, repo), + \ a:0 == 1 ? s:parse_options(a:1) : s:base_spec) + 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(v:exception) + endtry +endfunction + +function! s:parse_options(arg) + let opts = copy(s:base_spec) + let type = type(a:arg) + if type == s:TYPE.string + let opts.tag = a:arg + elseif type == s:TYPE.dict + call extend(opts, a:arg) + if has_key(opts, 'dir') + let opts.dir = s:dirpath(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(expand(repo)) } + else + if repo =~ ':' + let uri = repo + else + if repo !~ '/' + let repo = 'vim-scripts/'. repo + endif + let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git') + let uri = printf(fmt, repo) + endif + let dir = s:dirpath( fnamemodify(join([g:plug_home, a:name], '/'), ':p') ) + return { 'dir': dir, '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([spec.dir, '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 /^-/ + syn match plugPlus /^+/ + syn match plugStar /^*/ + syn match plugMessage /\(^- \)\@<=.*/ + syn match plugName /\(^- \)\@<=[^ ]*:/ + syn match plugInstall /\(^+ \)\@<=[^:]*/ + syn match plugUpdate /\(^* \)\@<=[^:]*/ + syn match plugCommit /^ [0-9a-z]\{7} .*/ contains=plugRelDate,plugSha + syn match plugSha /\(^ \)\@<=[0-9a-z]\{7}/ contained + syn match plugRelDate /([^)]*)$/ contained + syn match plugNotLoaded /(not loaded)$/ + syn match plugError /^x.*/ + syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean + hi def link plug1 Title + hi def link plug2 Repeat + 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 plugRelDate Comment + hi def link plugSha Identifier + + 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:prepare() + call s:job_abort() + if s:switch_in() + silent %d _ + else + call s:new_window() + nnoremap <silent> <buffer> q :if b:plug_preview==1<bar>pc<bar>endif<bar>echo<bar>q<cr> + nnoremap <silent> <buffer> R :silent! call <SID>retry()<cr> + nnoremap <silent> <buffer> D :PlugDiff<cr> + nnoremap <silent> <buffer> S :PlugStatus<cr> + nnoremap <silent> <buffer> U :call <SID>status_update()<cr> + xnoremap <silent> <buffer> U :call <SID>status_update()<cr> + nnoremap <silent> <buffer> ]] :silent! call <SID>section('')<cr> + nnoremap <silent> <buffer> [[ :silent! call <SID>section('b')<cr> + let b:plug_preview = -1 + let s:plug_tab = tabpagenr() + let s:plug_buf = winbufnr(0) + call s:assign_name() + endif + silent! unmap <buffer> <cr> + silent! unmap <buffer> L + silent! unmap <buffer> o + silent! unmap <buffer> X + setlocal buftype=nofile bufhidden=wipe nobuflisted noswapfile nowrap cursorline modifiable + setf vim-plug + call s:syntax() +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: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 && !empty(s:system_chomp('git log --pretty=format:"%h" "HEAD...HEAD@{1}"', spec.dir))) + if a:force || installed || updated + execute 'cd' s:esc(spec.dir) + call append(3, '- Post-update hook for '. name .' ... ') + let type = type(spec.do) + if type == s:TYPE.string + try + " FIXME: Escaping is incomplete. We could use shellescape with eval, + " but it won't work on Windows. + let g:_plug_do = '!'.escape(spec.do, '#!%') + execute "normal! :execute g:_plug_do\<cr>\<cr>" + finally + let result = v:shell_error ? ('Exit status: '.v:shell_error) : 'Done!' + unlet g:_plug_do + endtry + elseif type == s:TYPE.funcref + try + let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged') + call spec.do({ 'name': name, 'status': status, 'force': a:force }) + let result = 'Done!' + catch + let result = 'Error: ' . v:exception + endtry + else + let result = 'Error: Invalid type!' + endif + call setline(4, getline(4) . result) + cd - + endif + endfor +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 ... ') + 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 =~ '^- ' && stridx(v:val, 'Already up-to-date') < 0")) + call add(msgs, "Press 'D' to see the updated changes.") + endif + echo join(msgs, ' ') +endfunction + +function! s:retry() + if empty(s:update.errors) + return + endif + 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:update_impl(pull, force, args) abort + let args = copy(a:args) + let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ? + \ remove(args, -1) : get(g:, 'plug_threads', s:is_win ? 1 : 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) + echohl WarningMsg + echo 'No plugin to '. (a:pull ? 'update' : 'install') . '.' + echohl None + return + 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 + echohl WarningMsg + echomsg 'vim-plug: update Neovim for parallel installer' + echohl None + endif + + let python = (has('python') || has('python3')) && !s:is_win && !has('win32unix') + \ && (!s:nvim || has('vim_starting')) + let ruby = has('ruby') && !s:nvim && (v:version >= 703 || v:version == 702 && has('patch374')) + + let s:update = { + \ 'start': reltime(), + \ 'all': todo, + \ 'todo': copy(todo), + \ 'errors': [], + \ 'pull': a:pull, + \ 'force': a:force, + \ 'new': {}, + \ 'threads': (python || ruby || s:nvim) ? min([len(todo), threads]) : 1, + \ 'bar': '', + \ 'fin': 0 + \ } + + call s:prepare() + call append(0, ['', '']) + normal! 2G + silent! redraw + + let s:clone_opt = get(g:, 'plug_shallow', 1) ? + \ '--depth 1' . (s:git_version_requirement(1, 7, 10) ? ' --no-single-branch' : '') : '' + + " Python version requirement (>= 2.7) + if python && !has('python3') && !ruby && !s:nvim && 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() + endif +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 s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'has_key(v:val, "do")')) + 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 || !exists('s:jobs') + return + endif + + for [name, j] in items(s:jobs) + silent! call jobstop(j.jobid) + if j.new + call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir)) + endif + endfor + let s:jobs = {} +endfunction + +" When a:event == 'stdout', data = list of strings +" When a:event == 'exit', data = returncode +function! s:job_handler(job_id, data, event) abort + if !s:plug_window_exists() " plug window closed + return s:job_abort() + endif + + if a:event == 'stdout' + let self.result .= substitute(s:to_s(a:data), '[\r\n]', '', 'g') . "\n" + " To reduce the number of buffer updates + let self.tick = get(self, 'tick', -1) + 1 + if self.tick % len(s:jobs) == 0 + call s:log(self.new ? '+' : '*', self.name, self.result) + endif + elseif a:event == 'exit' + let self.running = 0 + if a:data != 0 + let self.error = 1 + endif + call s:reap(self.name) + call s:tick() + endif +endfunction + +function! s:spawn(name, cmd, opts) + let job = { 'name': a:name, 'running': 1, 'error': 0, 'result': '', + \ 'new': get(a:opts, 'new', 0), + \ 'on_stdout': function('s:job_handler'), + \ 'on_exit' : function('s:job_handler'), + \ } + let s:jobs[a:name] = job + + if s:nvim + let argv = [ 'sh', '-c', + \ (has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd) ] + let jid = jobstart(argv, job) + if jid > 0 + let job.jobid = jid + else + let job.running = 0 + let job.error = 1 + let job.result = jid < 0 ? 'sh is not executable' : + \ 'Invalid arguments (or job table is full)' + endif + else + let params = has_key(a:opts, 'dir') ? [a:cmd, a:opts.dir] : [a:cmd] + let job.result = call('s:system', params) + 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' : '=' + + call s:log(job.error ? 'x' : '-', a:name, job.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) + for i in range(1, line('$')) + if getline(i) =~# '^[-+x*] '.a:name.':' + return i + endif + endfor + return 0 +endfunction + +function! s:log(bullet, name, lines) + if s:switch_in() + let pos = s:logpos(a:name) + if pos > 0 + execute pos 'd _' + if pos > winheight('.') + let pos = 4 + endif + else + let pos = 4 + endif + call append(pos - 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) +while 1 " Without TCO, Vim stack is bound to explode + if empty(s:update.todo) + if empty(s:jobs) && !s:update.fin + let s:update.fin = 1 + call s:update_finish() + endif + return + endif + + let name = keys(s:update.todo)[0] + let spec = remove(s:update.todo, name) + let new = !isdirectory(spec.dir) + + call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...') + redraw + + let has_tag = has_key(spec, 'tag') + let checkout = s:shellesc(has_tag ? spec.tag : spec.branch) + let merge = s:shellesc(has_tag ? spec.tag : 'origin/'.spec.branch) + + if !new + let [valid, msg] = s:git_valid(spec, 0) + if valid + if pull + let fetch_opt = (has_tag && !empty(globpath(spec.dir, '.git/shallow'))) ? '--depth 99999999' : '' + call s:spawn(name, + \ printf('(git fetch %s %s 2>&1 && git checkout -q %s 2>&1 && git merge --ff-only %s 2>&1 && git submodule update --init --recursive 2>&1)', + \ fetch_opt, prog, checkout, merge), { 'dir': spec.dir }) + else + let s:jobs[name] = { 'running': 0, 'result': 'Already installed', 'error': 0 } + endif + else + let s:jobs[name] = { 'running': 0, 'result': msg, 'error': 1 } + endif + else + call s:spawn(name, + \ printf('git clone %s %s --recursive %s -b %s %s 2>&1', + \ has_tag ? '' : s:clone_opt, + \ prog, + \ s:shellesc(spec.uri), + \ checkout, + \ s:shellesc(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('python3') ? 'python3' : 'python' +execute py_exe "<< EOF" +""" Due to use of signals this function is POSIX only. """ +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 = 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_THREADS = {} + +class BaseExc(Exception): + def __init__(self, msg): + self._msg = msg + @property + def msg(self): + return self._msg +class CmdTimedOut(BaseExc): + pass +class CmdFailed(BaseExc): + pass +class InvalidURI(BaseExc): + pass +class Action(object): + INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-'] + +class Buffer(object): + def __init__(self, lock, num_plugs, is_pull, is_win): + self.bar = '' + self.event = 'Updating' if is_pull else 'Installing' + self.is_win = is_win + 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') + if not self.is_win: + 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)] + padded_rest = [' ' + line for line in rest] + msg.extend(padded_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): + def __init__(self, cmd, cmd_dir=None, timeout=60, ntries=3, cb=None, clean=None): + self.cmd = cmd + self.cmd_dir = cmd_dir + self.timeout = timeout + self.ntries = ntries + self.callback = cb if cb else (lambda msg: None) + self.clean = clean + + def attempt_cmd(self): + """ Tries to run the command, returns result if no exceptions. """ + attempt = 0 + finished = False + limit = self.timeout + + while not finished: + try: + attempt += 1 + result = self.timeout_cmd() + finished = True + except CmdTimedOut: + if attempt != self.ntries: + 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.timeout += limit + self.callback(['Retrying ...']) + else: + raise + + return result + + def timeout_cmd(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 + """ + proc = None + first_line = True + try: + tfile = tempfile.NamedTemporaryFile(mode='w+b', delete=False) + proc = subprocess.Popen(self.cmd, cwd=self.cmd_dir, stdout=tfile, + stderr=subprocess.STDOUT, shell=True, preexec_fn=os.setsid) + while proc.poll() is None: + # Yield this thread + time.sleep(0.2) + + if G_STOP.is_set(): + raise KeyboardInterrupt + + if first_line or random.random() < G_LOG_PROB: + first_line = False + line = 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!']) + + tfile.seek(0) + result = [line.decode().rstrip() for line in tfile] + + if proc.returncode != 0: + msg = [''] + msg.extend(result) + raise CmdFailed(msg) + except: + if proc and proc.poll() is None: + os.killpg(proc.pid, signal.SIGTERM) + if self.clean: + self.clean() + raise + finally: + os.remove(tfile.name) + + return result + +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 + tag = args.get('tag', 0) + self.checkout = esc(tag if tag else args['branch']) + self.merge = esc(tag if tag else 'origin/' + args['branch']) + self.tag = tag + + 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 (CmdTimedOut, CmdFailed, InvalidURI) 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'] + + 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} --recursive {2} -b {3} {4} 2>&1'.format( + '' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'], self.checkout, esc(target)) + com = Command(cmd, None, G_TIMEOUT, G_RETRIES, callback, clean(target)) + result = com.attempt_cmd() + self.write(Action.DONE, self.name, result[-1:]) + + def update(self): + match = re.compile(r'git::?@') + actual_uri = re.sub(match, '', self.repo_uri()) + expect_uri = re.sub(match, '', self.args['uri']) + if actual_uri != expect_uri: + 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 '' + cmds = ['git fetch {0} {1}'.format(fetch_opt, G_PROGRESS), + 'git checkout -q {0}'.format(self.checkout), + 'git merge --ff-only {0}'.format(self.merge), + 'git submodule update --init --recursive'] + cmd = ' 2>&1 && '.join(cmds) + com = Command(cmd, self.args['dir'], G_TIMEOUT, G_RETRIES, callback) + result = com.attempt_cmd() + self.write(Action.DONE, self.name, result[-1:]) + else: + self.write(Action.DONE, self.name, ['Already installed']) + + def repo_uri(self): + cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url' + command = Command(cmd, self.args['dir'], G_TIMEOUT, G_RETRIES) + result = command.attempt_cmd() + return result[-1] + + 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 + finally: + global G_THREADS + with lock: + del G_THREADS[thr.current_thread().name] + +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.2) + + 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() + 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' + is_win = vim.eval('s:is_win') == '1' + + lock = thr.Lock() + buf = Buffer(lock, len(plugs), G_PULL, is_win) + buf_q, work_q = queue.Queue(), queue.Queue() + for work in plugs.items(): + work_q.put(work) + + global G_THREADS + for num in range(nthreads): + tname = 'PlugT-{0:02}'.format(num) + thread = PlugThread(tname, (buf_q, work_q, lock)) + thread.start() + G_THREADS[tname] = thread + if mac_gui: + rthread = RefreshThread(lock) + rthread.start() + + while not buf_q.empty() or len(G_THREADS) != 0: + try: + action, name, msg = buf_q.get(True, 0.25) + buf.write(action, name, 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] + 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 + + 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 + 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') unless iswin + } + 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}"] + 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 { + while VIM::evaluate('getchar(1)') + sleep 0.1 + end + mtx.synchronize do + running = false + threads.each { |t| t.raise Interrupt } + 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') + 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, branch, tag = pair.last.values_at *%w[dir uri branch tag] + checkout = esc(tag ? tag : branch) + merge = esc(tag ? tag : "origin/#{branch}") + subm = "git submodule update --init --recursive 2>&1" + exists = File.directory? dir + ok, result = + if exists + dir = iswin ? dir : esc(dir) + ret, data = bt.call "#{cd} #{dir} && git rev-parse --abbrev-ref HEAD 2>&1 && 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 current_uri.sub(/git::?@/, '') != uri.sub(/git::?@/, '') + [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 "#{cd} #{dir} && git fetch #{fetch_opt} #{progress} 2>&1 && git checkout -q #{checkout} 2>&1 && git merge --ff-only #{merge} 2>&1 && #{subm}", 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} --recursive #{uri} -b #{checkout} #{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(arg) + return '"'.escape(a:arg, '"').'"' +endfunction + +function! s:glob_dir(path) + return map(filter(s:lines(globpath(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) + let a = substitute(a:a, 'git:\{1,2}@', '', '') + let b = substitute(a:b, 'git:\{1,2}@', '', '') + return a ==# b +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) + return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd) +endfunction + +function! s:system(cmd, ...) + try + let [sh, shrd] = [&shell, &shellredir] + if !s:is_win + set shell=sh shellredir=>%s\ 2>&1 + endif + let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd + return system(s:is_win ? '('.cmd.')' : cmd) + finally + let [&shell, &shellredir] = [sh, shrd] + endtry +endfunction + +function! s:system_chomp(...) + let ret = call('s:system', a:000) + return v:shell_error ? '' : substitute(ret, '\n$', '', '') +endfunction + +function! s:git_valid(spec, check_branch) + let ret = 1 + let msg = 'OK' + if isdirectory(a:spec.dir) + let result = s:lines(s:system('git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url', a:spec.dir)) + let remote = result[-1] + if v:shell_error + let msg = join([remote, 'PlugClean required.'], "\n") + let ret = 0 + elseif !s:compare_git_uri(remote, a:spec.uri) + let msg = join(['Invalid URI: '.remote, + \ 'Expected: '.a:spec.uri, + \ 'PlugClean required.'], "\n") + let ret = 0 + elseif a:check_branch + let branch = result[0] + " Check tag + 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 + let msg = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.', + \ (empty(tag) ? 'N/A' : tag), a:spec.tag) + let ret = 0 + endif + " Check branch + elseif a:spec.branch !=# branch + let msg = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.', + \ branch, a:spec.branch) + let ret = 0 + endif + endif + else + let msg = 'Not found' + let ret = 0 + endif + return [ret, msg] +endfunction + +function! s:rm_rf(dir) + if isdirectory(a:dir) + call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(a:dir)) + endif +endfunction + +function! s:clean(force) + call s:prepare() + call append(0, 'Searching for unused plugins in '.g:plug_home) + call append(1, '') + + " List of valid directories + let dirs = [] + let [cnt, total] = [0, len(g:plugs)] + for [name, spec] in items(g:plugs) + if !s:is_managed(name) || s:git_valid(spec, 0)[0] + call add(dirs, spec.dir) + 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(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) + let found = filter(found, 'stridx(v:val, f) != 0') + end + endwhile + + normal! G + redraw + if empty(todo) + call append(line('$'), 'Already clean.') + else + call inputsave() + let yes = a:force || (input('Proceed? (y/N) ') =~? '^y') + call inputrestore() + if yes + for dir in todo + call s:rm_rf(dir) + endfor + call append(line('$'), 'Removed.') + else + call append(line('$'), 'Cancelled.') + endif + endif + normal! G +endfunction + +function! s:upgrade() + echo 'Downloading the latest version of vim-plug' + redraw + let tmp = tempname() + let new = tmp . '/plug.vim' + + try + let out = s:system(printf('git clone --depth 1 %s %s', 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) + if has_key(spec, 'uri') + if isdirectory(spec.dir) + let [valid, msg] = s:git_valid(spec, 1) + else + let [valid, msg] = [0, 'Not found. Try PlugInstall.'] + endif + else + if isdirectory(spec.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 valid && 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 <silent> <buffer> L :call <SID>status_load(line('.'))<cr> + xnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr> + 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 + return 0 +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('.'), '\(^ \)\@<=[0-9a-z]\{7}') + if empty(sha) + return + endif + + let name = s:find_name(line('.')) + if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir) + return + endif + + execute 'pedit' sha + wincmd P + setlocal filetype=git buftype=nofile nobuflisted + execute 'silent read !cd' s:shellesc(g:plugs[name].dir) '&& git show --pretty=medium' sha + normal! gg"_dd + wincmd p +endfunction + +function! s:section(flags) + call search('\(^[x-] \)\@<=[^:]\+:', a:flags) +endfunction + +function! s:diff() + call s:prepare() + call append(0, 'Collecting updated changes ...') + normal! gg + redraw + + let cnt = 0 + for [k, v] in items(g:plugs) + if !isdirectory(v.dir) || !s:is_managed(k) + continue + endif + + let diff = s:system_chomp('git log --pretty=format:"%h %s (%cr)" "HEAD...HEAD@{1}"', v.dir) + if !empty(diff) + call append(1, '') + call append(2, '- '.k.':') + call append(3, map(s:lines(diff), '" ". v:val')) + let cnt += 1 + normal! gg + redraw + endif + endfor + + call setline(1, cnt == 0 ? 'No updates.' : 'Last update:') + nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr> + nnoremap <silent> <buffer> o :silent! call <SID>preview_commit()<cr> + nnoremap <silent> <buffer> X :call <SID>revert()<cr> + normal! gg + setlocal nomodifiable + if cnt > 0 + echo "Press 'X' on each block to revert the update" + endif +endfunction + +function! s:revert() + 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 '.s:esc(g:plugs[name].branch), g:plugs[name].dir) + setlocal modifiable + normal! "_dap + setlocal nomodifiable + echo 'Reverted.' +endfunction + +function! s:snapshot(...) abort + let home = get(s:, 'plug_home_org', g:plug_home) + let [type, var, header] = s:is_win ? + \ ['dosbatch', '%PLUG_HOME%', + \ ['@echo off', ':: Generated by vim-plug', ':: '.strftime("%c"), '', + \ ':: Make sure to PlugUpdate first', '', 'set PLUG_HOME='.home]] : + \ ['sh', '$PLUG_HOME', + \ ['#!/bin/sh', '# Generated by vim-plug', '# '.strftime("%c"), '', + \ 'vim +PlugUpdate +qa', '', 'PLUG_HOME='.s:esc(home)]] + + call s:prepare() + execute 'setf' type + call append(0, header) + call append('$', '') + 1 + redraw + + let dirs = sort(map(values(filter(copy(g:plugs), + \'has_key(v:val, "uri") && isdirectory(v:val.dir)')), 'v:val.dir')) + let anchor = line('$') - 1 + for dir in reverse(dirs) + let sha = s:system_chomp('git rev-parse --short HEAD', dir) + if !empty(sha) + call append(anchor, printf('cd %s && git reset --hard %s', + \ substitute(dir, '^\V'.escape(g:plug_home, '\'), var, ''), sha)) + redraw + endif + endfor + + if a:0 > 0 + let fn = expand(a:1) + let fne = s:esc(fn) + call writefile(getline(1, '$'), fn) + if !s:is_win | call s:system('chmod +x ' . fne) | endif + echo 'Saved to '.a:1 + silent execute 'e' fne + endif +endfunction + +function! s:split_rtp() + return split(&rtp, '\\\@<!,') +endfunction + +let s:first_rtp = s:escrtp(get(s:split_rtp(), 0, '')) +let s:last_rtp = s:escrtp(get(s:split_rtp(), -1, '')) + +if exists('g:plugs') + let g:plugs_order = get(g:, 'plugs_order', keys(g:plugs)) + call s:upgrade_specs() + call s:define_commands() +endif + +let &cpo = s:cpo_save +unlet s:cpo_save + diff --git a/vim/.vim/colors/base16-eighties.vim b/vim/.vim/colors/base16-eighties.vim new file mode 100644 index 0000000..80e653d --- /dev/null +++ b/vim/.vim/colors/base16-eighties.vim @@ -0,0 +1,304 @@ +" Base16 Eighties (https://github.com/chriskempson/base16) +" Scheme: Chris Kempson (http://chriskempson.com) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-eighties.".&background.".sh" + endif +endif + +" GUI color definitions +let s:gui00 = "2d2d2d" +let s:gui01 = "393939" +let s:gui02 = "515151" +let s:gui03 = "747369" +let s:gui04 = "a09f93" +let s:gui05 = "d3d0c8" +let s:gui06 = "e8e6df" +let s:gui07 = "f2f0ec" +let s:gui08 = "f2777a" +let s:gui09 = "f99157" +let s:gui0A = "ffcc66" +let s:gui0B = "99cc99" +let s:gui0C = "66cccc" +let s:gui0D = "6699cc" +let s:gui0E = "cc99cc" +let s:gui0F = "d27b53" + +" Terminal color definitions +let s:cterm00 = "00" +let s:cterm03 = "08" +let s:cterm05 = "07" +let s:cterm07 = "15" +let s:cterm08 = "01" +let s:cterm0A = "03" +let s:cterm0B = "02" +let s:cterm0C = "06" +let s:cterm0D = "04" +let s:cterm0E = "05" +if exists('base16colorspace') && base16colorspace == "256" + let s:cterm01 = "18" + let s:cterm02 = "19" + let s:cterm04 = "20" + let s:cterm06 = "21" + let s:cterm09 = "16" + let s:cterm0F = "17" +else + let s:cterm01 = "10" + let s:cterm02 = "11" + let s:cterm04 = "12" + let s:cterm06 = "13" + let s:cterm09 = "09" + let s:cterm0F = "14" +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-eighties" + +" Highlighting function +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr) + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif +endfun + +" Return GUI color for light/dark variants +fun s:gui(color) + if &background == "dark" + return a:color + endif + + if a:color == s:gui00 + return s:gui07 + elseif a:color == s:gui01 + return s:gui06 + elseif a:color == s:gui02 + return s:gui05 + elseif a:color == s:gui03 + return s:gui04 + elseif a:color == s:gui04 + return s:gui03 + elseif a:color == s:gui05 + return s:gui02 + elseif a:color == s:gui06 + return s:gui01 + elseif a:color == s:gui07 + return s:gui00 + endif + + return a:color +endfun + +" Return terminal color for light/dark variants +fun s:cterm(color) + if &background == "dark" + return a:color + endif + + if a:color == s:cterm00 + return s:cterm07 + elseif a:color == s:cterm01 + return s:cterm06 + elseif a:color == s:cterm02 + return s:cterm05 + elseif a:color == s:cterm03 + return s:cterm04 + elseif a:color == s:cterm04 + return s:cterm03 + elseif a:color == s:cterm05 + return s:cterm02 + elseif a:color == s:cterm06 + return s:cterm01 + elseif a:color == s:cterm07 + return s:cterm00 + endif + + return a:color +endfun + +" Vim editor colors +call <sid>hi("Bold", "", "", "", "", "bold") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "") +call <sid>hi("FoldColumn", "", s:gui01, "", s:cterm01, "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") +call <sid>hi("Italic", "", "", "", "", "none") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "") +call <sid>hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "") +call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "") +call <sid>hi("WildMenu", s:gui08, "", s:cterm08, "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "") +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none") +call <sid>hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") +call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") +call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") + +" Git highlighting +call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") +call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") +call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") +call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") +call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") +call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") + +" Remove functions +delf <sid>hi +delf <sid>gui +delf <sid>cterm + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/vim/.vim/colors/zenburn.vim b/vim/.vim/colors/zenburn.vim new file mode 100644 index 0000000..8527c9c --- /dev/null +++ b/vim/.vim/colors/zenburn.vim @@ -0,0 +1,467 @@ +" Vim color file +" Maintainer: Jani Nurminen <slinky@iki.fi> +" URL: http://slinky.imukuppi.org/zenburnpage/ +" License: GNU GPL <http://www.gnu.org/licenses/gpl.html> +" +" Nothing too fancy, just some alien fruit salad to keep you in the zone. +" This syntax file was designed to be used with dark environments and +" low light situations. Of course, if it works during a daybright office, go +" ahead :) +" +" Owes heavily to other Vim color files! With special mentions +" to "BlackDust", "Camo" and "Desert". +" +" To install, copy to ~/.vim/colors directory. +" +" Alternatively, you can use Vimball installation: +" vim zenburn.vba +" :so % +" :q +" +" For details, see :help vimball +" +" After installation, use it with :colorscheme zenburn. +" See also :help syntax +" +" Credits: +" - Jani Nurminen - original Zenburn, maintainer +" - Steve Hall & Cream posse - higher-contrast Visual selection +" - Kurt Maier - 256 color console coloring, low and high contrast toggle, +" bug fixing +" - Charlie - spotted too bright StatusLine in non-high contrast mode +" - Pablo Castellazzi - CursorLine fix for 256 color mode +" - Tim Smith - force dark background +" - John Gabriele - spotted bad Ignore-group handling +" - Zac Thompson - spotted invisible NonText in low contrast mode +" - Christophe-Marie Duquesne - suggested making a Vimball, +" suggested support for ctags_highlighting.vim +" - Andrew Wagner - noted the CursorColumn bug (guifg was unintentionally set), +" unify CursorColumn colour +" - Martin Langasek - clarify the license, whitespace fixes +" - Marcin Szamotulski - support autocomplete for Zenburn configuration +" parameters +" - Clayton Parker (claytron) - Convinced by Kurt Maier to use Zenburn. Point +" out issues with LineNr, fix directory styles, and their usage in MacVim. +" - Paweł Piekarski - Spotted bad FoldColumn and TabLine. Made better +" FoldColumn colors, fixed TabLine colors. +" - Jim - Fix for missing Include group for terminal +" - Peter (Sakartu) - ColorColumn fixes +" - Please see git log for the others not listed here +" +" CONFIGURABLE PARAMETERS: +" +" You can use the default (don't set any parameters), or you can +" set some parameters to tweak the Zenburn colours. +" +" To use them, put them into your .vimrc file before loading the color scheme, +" example: +" let g:zenburn_high_Contrast=1 +" colors zenburn +" +" You can also do ":let g:zenburn" then hit Ctrl-d or Tab to scroll through the +" list of configurable parameters. +" +" * You can now set a darker background for bright environments. To activate, use: +" let g:zenburn_high_Contrast = 1 +" +" * For transparent terminals set the background to black with: +" let g:zenburn_transparent = 1 +" +" * For example, Vim help files uses the Ignore-group for the pipes in tags +" like "|somelink.txt|". By default, the pipes are not visible, as they +" map to Ignore group. If you wish to enable coloring of the Ignore group, +" set the following parameter to 1. Warning, it might make some syntax files +" look strange. +" +" let g:zenburn_color_also_Ignore = 1 +" +" * To get more contrast to the Visual selection, use +" +" let g:zenburn_alternate_Visual = 1 +" +" Note: this is enabled only if the old-style Visual +" if used, see g:zenburn_old_Visual +" +" * To use alternate colouring for Error message, use +" +" let g:zenburn_alternate_Error = 1 +" +" * The new default for Include is a duller orange. To use the original +" colouring for Include, use +" +" let g:zenburn_alternate_Include = 1 +" +" * To disable underlining for Labels, use +" +" let g:zenburn_disable_Label_underline = 1 +" +" * Work-around to a Vim bug, it seems to misinterpret ctermfg and 234 and 237 +" as light values, and sets background to light for some people. If you have +" this problem, use: +" +" let g:zenburn_force_dark_Background = 1 +" +" * By default the CursorColumn is of a lighter colour. I find it more readable +" that way, but some people may want to align it with the darker CursorLine +" color, for visual uniformity. To do so, use: +" +" let g:zenburn_unified_CursorColumn = 1 +" +" Note: you can ignore this unless you use +" ":set cursorline cursorcolumn", since otherwise the effect won't be +" seen. +" +" * New (dark) Visual coloring has been introduced. +" The dark Visual is more aligned with the rest of the colour scheme, +" especially if you use line numbers. If you wish to use the +" old Visual coloring, use +" +" let g:zenburn_old_Visual = 1 +" +" Default is to use the new Visual. +" +" * EXPERIMENTAL FEATURE: Zenburn would like to support TagHighlight +" (an evolved ctags-highlighter) by Al Budden (homepage: +" http://www.cgtk.co.uk/vim-scripts/taghighlight). +" Current support status is broken: there is no automatic detection of +" TagHighlight, no specific language support; however there is some basic +" support for Python. If you are a user of TagHighlight and want to help, +" please enable: +" +" let g:zenburn_enable_TagHighlight=1 +" +" and improve the corresponding block at the end of the file. +" +" NOTE: +" +" * To turn the parameter(s) back to defaults, use UNLET or set them to 0: +" +" unlet g:zenburn_alternate_Include +" or +" let g:zenburn_alternate_Include = 0 +" +" +" That's it, enjoy! +" +" TODO +" - Visual alternate color is broken? Try GVim >= 7.0.66 if you have trouble +" - IME colouring (CursorIM) + +" Finish if we are in a term lacking 256 color support +if ! has("gui_running") && &t_Co <= 255 + finish +endif + +" Set defaults, but keep any parameters already set by the user +if ! exists("g:zenburn_high_Contrast") + let g:zenburn_high_Contrast = 0 +endif + +if ! exists("g:zenburn_transparent") + let g:zenburn_transparent = 0 +endif + +if ! exists("g:zenburn_color_also_Ignore") + let g:zenburn_color_also_Ignore = 0 +endif + +if ! exists("g:zenburn_alternate_Error") + let g:zenburn_alternate_Error = 0 +endif + +if ! exists("g:zenburn_force_dark_Background") + let g:zenburn_force_dark_Background = 0 +endif + +if ! exists("g:zenburn_alternate_Visual") + let g:zenburn_alternate_Visual = 0 +endif + +if ! exists("g:zenburn_alternate_Include") + let g:zenburn_alternate_Include = 0 +endif + +if ! exists("g:zenburn_disable_Label_underline") + let g:zenburn_disable_Label_underline = 0 +endif + +if ! exists("g:zenburn_unified_CursorColumn") + let g:zenburn_unified_CursorColumn = 0 +endif + +if ! exists("g:zenburn_old_Visual") + let g:zenburn_old_Visual = 0 +endif + +if ! exists("g:zenburn_enable_TagHighlight") + let g:zenburn_enable_TagHighlight = 0 +endif + +" ----------------------------------------------- + +set background=dark + +hi clear +if exists("syntax_on") + syntax reset +endif +let g:colors_name="zenburn" + +hi Boolean guifg=#dca3a3 ctermfg=181 +hi Character guifg=#dca3a3 gui=bold ctermfg=181 cterm=bold +hi Comment guifg=#7f9f7f gui=italic ctermfg=108 +hi Conditional guifg=#f0dfaf gui=bold ctermfg=223 cterm=bold +hi Constant guifg=#dca3a3 gui=bold ctermfg=181 cterm=bold +hi Cursor guifg=#000d18 guibg=#8faf9f gui=bold ctermfg=233 ctermbg=109 cterm=bold +hi Debug guifg=#bca3a3 gui=bold ctermfg=181 cterm=bold +hi Define guifg=#ffcfaf gui=bold ctermfg=223 cterm=bold +hi Delimiter guifg=#8f8f8f ctermfg=245 +hi DiffAdd guifg=#709080 guibg=#313c36 gui=bold ctermfg=66 ctermbg=237 cterm=bold +hi DiffChange guibg=#333333 ctermbg=236 +hi DiffDelete guifg=#333333 guibg=#464646 ctermfg=236 ctermbg=238 +hi DiffText guifg=#ecbcbc guibg=#41363c gui=bold ctermfg=217 ctermbg=237 cterm=bold +hi Directory guifg=#9fafaf gui=bold ctermfg=109 cterm=bold +hi ErrorMsg guifg=#80d4aa guibg=#2f2f2f gui=bold ctermfg=115 ctermbg=236 cterm=bold +hi Exception guifg=#c3bf9f gui=bold ctermfg=249 cterm=bold +hi Float guifg=#c0bed1 ctermfg=251 +hi FoldColumn guifg=#93b3a3 guibg=#3f4040 +hi Folded guifg=#93b3a3 guibg=#3f4040 +hi Function guifg=#efef8f ctermfg=228 +hi Identifier guifg=#efdcbc ctermfg=223 +hi IncSearch guifg=#f8f893 guibg=#385f38 ctermfg=228 ctermbg=23 +hi Keyword guifg=#f0dfaf gui=bold ctermfg=223 cterm=bold +hi Macro guifg=#ffcfaf gui=bold ctermfg=223 cterm=bold +hi ModeMsg guifg=#ffcfaf gui=none ctermfg=223 cterm=none +hi MoreMsg guifg=#ffffff gui=bold ctermfg=231 cterm=bold +hi Number guifg=#8cd0d3 ctermfg=116 +hi Operator guifg=#f0efd0 ctermfg=230 +hi PmenuSbar guibg=#2e3330 guifg=#000000 ctermfg=16 ctermbg=236 +hi PmenuThumb guibg=#a0afa0 guifg=#040404 ctermfg=232 ctermbg=151 +hi PreCondit guifg=#dfaf8f gui=bold ctermfg=180 cterm=bold +hi PreProc guifg=#ffcfaf gui=bold ctermfg=223 cterm=bold +hi Question guifg=#ffffff gui=bold ctermfg=231 cterm=bold +hi Repeat guifg=#ffd7a7 gui=bold ctermfg=223 cterm=bold +hi Search guifg=#ffffe0 guibg=#284f28 ctermfg=230 ctermbg=22 +hi SignColumn guifg=#9fafaf gui=bold ctermfg=109 cterm=bold +hi SpecialChar guifg=#dca3a3 gui=bold ctermfg=181 cterm=bold +hi SpecialComment guifg=#82a282 gui=bold ctermfg=108 cterm=bold +hi Special guifg=#cfbfaf ctermfg=181 +hi SpecialKey guifg=#9ece9e ctermfg=151 +hi Statement guifg=#e3ceab gui=none ctermfg=187 cterm=none +hi StatusLine guifg=#313633 guibg=#ccdc90 ctermfg=236 ctermbg=186 +hi StatusLineNC guifg=#2e3330 guibg=#88b090 ctermfg=235 ctermbg=108 +hi StorageClass guifg=#c3bf9f gui=bold ctermfg=249 cterm=bold +hi String guifg=#cc9393 ctermfg=174 +hi Structure guifg=#efefaf gui=bold ctermfg=229 cterm=bold +hi Tag guifg=#e89393 gui=bold ctermfg=181 cterm=bold +hi Title guifg=#efefef gui=bold ctermfg=255 ctermbg=NONE cterm=bold +hi Todo guifg=#dfdfdf guibg=NONE gui=bold ctermfg=254 ctermbg=NONE cterm=bold +hi Typedef guifg=#dfe4cf gui=bold ctermfg=253 cterm=bold +hi Type guifg=#dfdfbf gui=bold ctermfg=187 cterm=bold +hi Underlined guifg=#dcdccc gui=underline ctermfg=188 cterm=underline +hi VertSplit guifg=#2e3330 guibg=#688060 ctermfg=236 ctermbg=65 +hi VisualNOS guifg=#333333 guibg=#f18c96 gui=bold,underline ctermfg=236 ctermbg=210 cterm=bold +hi WarningMsg guifg=#ffffff guibg=#333333 gui=bold ctermfg=231 ctermbg=236 cterm=bold +hi WildMenu guifg=#cbecd0 guibg=#2c302d gui=underline ctermfg=194 ctermbg=236 cterm=underline + +" spellchecking, always "bright" term background +hi SpellBad guisp=#bc6c4c guifg=#dc8c6c ctermfg=209 ctermbg=237 +hi SpellCap guisp=#6c6c9c guifg=#8c8cbc ctermfg=103 ctermbg=237 +hi SpellRare guisp=#bc6c9c guifg=#bc8cbc ctermfg=139 ctermbg=237 +hi SpellLocal guisp=#7cac7c guifg=#9ccc9c ctermfg=151 ctermbg=237 + +if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast + " use new darker background + hi Normal guifg=#dcdccc guibg=#1f1f1f ctermfg=188 ctermbg=234 + hi ColorColumn guibg=#33332f ctermbg=235 + hi CursorLine guibg=#121212 gui=bold ctermbg=233 cterm=none + hi CursorLineNr guifg=#f2f3bb guibg=#161616 ctermfg=229 ctermbg=233 + if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn + hi CursorColumn guibg=#121212 gui=bold ctermbg=233 cterm=none + else + hi CursorColumn guibg=#2b2b2b ctermbg=235 cterm=none + endif + hi FoldColumn guibg=#161616 ctermbg=233 ctermfg=109 + hi Folded guibg=#161616 ctermbg=233 ctermfg=109 + hi LineNr guifg=#9fafaf guibg=#161616 ctermfg=248 ctermbg=233 + hi NonText guifg=#404040 gui=bold ctermfg=109 + hi Pmenu guibg=#242424 guifg=#ccccbc ctermfg=251 ctermbg=235 + hi PmenuSel guibg=#353a37 guifg=#ccdc90 gui=bold ctermfg=187 ctermbg=236 cterm=bold + hi MatchParen guifg=#f0f0c0 guibg=#383838 gui=bold ctermfg=229 ctermbg=237 cterm=bold + hi SignColumn guibg=#181818 ctermbg=233 + hi SpecialKey guibg=#242424 + hi TabLine guifg=#88b090 guibg=#313633 gui=none ctermbg=236 ctermfg=108 cterm=none + hi TabLineSel guifg=#ccd990 guibg=#222222 ctermbg=235 ctermfg=186 cterm=bold + hi TabLineFill guifg=#88b090 guibg=#313633 gui=none ctermbg=236 ctermfg=108 cterm=none +else + " Original, lighter background + hi Normal guifg=#dcdccc guibg=#3f3f3f ctermfg=188 ctermbg=237 + hi ColorColumn guibg=#484848 ctermbg=238 + hi CursorLine guibg=#434443 ctermbg=238 cterm=none + hi CursorLineNr guifg=#d2d39b guibg=#262626 ctermfg=230 ctermbg=235 + if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn + hi CursorColumn guibg=#434343 ctermbg=238 cterm=none + else + hi CursorColumn guibg=#4f4f4f ctermbg=239 cterm=none + endif + hi FoldColumn guibg=#333333 ctermbg=236 ctermfg=109 + hi Folded guibg=#333333 ctermbg=236 ctermfg=109 + hi LineNr guifg=#9fafaf guibg=#262626 ctermfg=248 ctermbg=235 + hi NonText guifg=#5b605e gui=bold ctermfg=240 + hi Pmenu guibg=#2c2e2e guifg=#9f9f9f ctermfg=248 ctermbg=235 + hi PmenuSel guibg=#242424 guifg=#d0d0a0 gui=bold ctermfg=187 ctermbg=235 cterm=bold + hi MatchParen guifg=#b2b2a0 guibg=#2e2e2e gui=bold ctermfg=145 ctermbg=236 cterm=bold + hi SignColumn guibg=#343434 ctermbg=236 + hi SpecialKey guibg=#444444 + hi TabLine guifg=#d0d0b8 guibg=#222222 gui=none ctermbg=235 ctermfg=187 cterm=none + hi TabLineSel guifg=#f0f0b0 guibg=#333333 gui=bold ctermbg=236 ctermfg=229 cterm=bold + hi TabLineFill guifg=#dccdcc guibg=#101010 gui=none ctermbg=233 ctermfg=188 cterm=none + + hi StatusLine ctermbg=144 +endif + +if exists("g:zenburn_force_dark_Background") && g:zenburn_force_dark_Background + " Force dark background, because of a bug in VIM: VIM sets background + " automatically during "hi Normal ctermfg=X"; it misinterprets the high + " value (234 or 237 above) as a light color, and wrongly sets background to + " light. See ":help highlight" for details. + set background=dark +endif + +if exists("g:zenburn_transparent") && g:zenburn_transparent + hi Normal ctermbg=0 guibg=#000000 + hi Statement ctermbg=NONE + hi Title ctermbg=NONE + hi Todo ctermbg=NONE + hi Underlined ctermbg=NONE + hi DiffAdd ctermbg=NONE + hi DiffText ctermbg=NONE + hi ErrorMsg ctermbg=NONE + hi LineNr ctermbg=NONE +endif + +if exists("g:zenburn_old_Visual") && g:zenburn_old_Visual + if exists("g:zenburn_alternate_Visual") && g:zenburn_alternate_Visual + " Visual with more contrast, thanks to Steve Hall & Cream posse + " gui=none fixes weird highlight problem in at least GVim 7.0.66, thanks to Kurt Maier + hi Visual guifg=#000000 guibg=#71d3b4 gui=none ctermfg=16 ctermbg=79 cterm=none + hi VisualNOS guifg=#000000 guibg=#71d3b4 gui=none ctermfg=16 ctermbg=79 cterm=none + else + " use default visual + hi Visual guifg=#233323 guibg=#71d3b4 gui=none ctermfg=235 ctermbg=79 cterm=none + hi VisualNOS guifg=#233323 guibg=#71d3b4 gui=none ctermfg=235 ctermbg=79 cterm=none + endif +else + " new Visual style + if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast + " high contrast + "hi Visual guibg=#304a3d + "hi VisualNos guibg=#304a3d + "TODO no nice greenish in console, 65 is closest. use full black instead, + "although i like the green..! + hi Visual guibg=#0f0f0f ctermbg=232 + hi VisualNOS guibg=#0f0f0f ctermbg=232 + if exists("g:zenburn_transparent") && g:zenburn_transparent + hi Visual ctermbg=235 + endif + else + " low contrast + hi Visual guibg=#2f2f2f ctermbg=235 + hi VisualNOS guibg=#2f2f2f ctermbg=235 + endif +endif + +if exists("g:zenburn_alternate_Error") && g:zenburn_alternate_Error + " use more jumpy Error + hi Error guifg=#e37170 guibg=#664040 gui=bold ctermfg=210 ctermbg=52 cterm=bold +else + " default is something more zenburn-compatible + hi Error guifg=#e37170 guibg=#3d3535 gui=bold ctermfg=167 ctermbg=236 cterm=bold +endif + +if exists("g:zenburn_alternate_Include") && g:zenburn_alternate_Include + " original setting + hi Include guifg=#ffcfaf gui=bold ctermfg=223 cterm=bold +else + " new, less contrasted one + hi Include guifg=#dfaf8f gui=bold ctermfg=180 cterm=bold +endif + +if exists("g:zenburn_disable_Label_underline") && g:zenburn_disable_Label_underline + hi Label guifg=#dfcfaf ctermfg=187 +else + hi Label guifg=#dfcfaf gui=underline ctermfg=187 cterm=underline +endif + +if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore + " color the Ignore groups + " note: if you get strange coloring for your files, turn this off (unlet) + if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast + hi Ignore ctermfg=238 + else + hi Ignore guifg=#545a4f ctermfg=240 + endif +endif + +" EXPERIMENTAL TagHighlight support +" link/set sensible defaults here; +" +" For now I mostly link to subset of Zenburn colors, the linkage is based +" on appearance, not semantics. In later versions I might define more new colours. +" +" HELP NEEDED to make this work properly. + +if exists("g:zenburn_enable_TagHighlight") && g:zenburn_enable_TagHighlight + " CTag support may vary, but the first step is to start using it so + " we can fix it! + " + " Consult /plugin/TagHighlight/data/kinds.txt for info on your + " language and what's been defined. + " + " There is potential for language indepedent features here. (Acutally, + " seems it may be required for this to be useful...) This way we can + " implement features depending on how well CTags are currently implemented + " for the language. ie. Global problem for python is annoying. Special + " colors are defined for special language features, etc.. + " + " For now all I care about is python supported features: + " c:CTagsClass + " f:CTagsFunction + " i:CTagsImport + " m:CTagsMember + " v:CTagsGlobalVariable + " + " Note: TagHighlight defaults to setting new tags to Keyword + " highlighting. + + " TODO conditionally run each section + " BEGIN Python Section + hi link Class Function + hi link Import PythonInclude + hi link Member Function + "Note: Function is already defined + + " Highlighter seems to think a lot of things are global variables even + " though they're not. Example: python method-local variable is + " coloured as a global variable. They should not be global, since + " they're not visible outside the method. + " If this is some very bright colour group then things look bad. + " hi link GlobalVariable Identifier + + " Because of this problem I am disabling the feature by setting it to + " Normal instead + hi link GlobalVariable Normal + " END Python Section + + " Starting point for other languages. + hi link GlobalConstant Constant + hi link EnumerationValue Float + hi link EnumerationName Identifier + hi link DefinedName WarningMsg + hi link LocalVariable WarningMsg + hi link Structure WarningMsg + hi link Union WarningMsg +endif + +" TODO check for more obscure syntax groups that they're ok + diff --git a/vim/.vim/ftdetect/pentadactyl.vim b/vim/.vim/ftdetect/pentadactyl.vim new file mode 100644 index 0000000..50766d7 --- /dev/null +++ b/vim/.vim/ftdetect/pentadactyl.vim @@ -0,0 +1,6 @@ +" Vim filetype detection file +" Language: Pentadactyl configuration file +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Version: 1.1 + +au BufNewFile,BufRead *pentadactylrc*,*.penta set filetype=pentadactyl diff --git a/vim/.vim/ftdetect/robot.vim b/vim/.vim/ftdetect/robot.vim new file mode 100644 index 0000000..b8ef126 --- /dev/null +++ b/vim/.vim/ftdetect/robot.vim @@ -0,0 +1,43 @@ +"============================================================================= +" File: ftdetect/robot.vim +" Author: Michael Foukarakis +" Version: 0.2 +" Created: Tue 21 Dec 2010 09:08:35 AM EET +" Last Update: Sat Sep 14, 2013 10:53 BST +"------------------------------------------------------------------------ +" Description: +" Filetype detection plugin for Robot files. +" WARNING: +" Overrides all default file type checks. +"------------------------------------------------------------------------ +" Installation: +" - Requires Vim7+ +" - Drop this file into {rtp}/ftdetect +" - Use the '# -*- coding: robot -*-' in the first line of robot files +" or set the g:robot_syntax_for_txt global variable +" to explicitly tell vim about filetype. +" History: - Replaced setf with setlocal filetype, much more sane. +" TODO: Missing features go here. +"============================================================================= +let s:cpo_save=&cpo +set cpo&vim + +" Try to guess when dealing with .html, .txt, or .rst files: +au BufNewFile,BufRead *.txt call s:FTrobot() +au BufNewFile,BufRead *.rst call s:FTrobot() +au BufNewFile,BufRead *.html call s:FTrobot() +" No resorting to heuristics for .robot files: +au BufNewFile,BufRead *.robot setlocal filetype=robot + +func! s:FTrobot() + let b:topl = getline(1) + if (exists("g:robot_syntax_for_txt") && g:robot_syntax_for_txt) + \ || b:topl =~ '\*\*\*.\{-}\*\*\*' + \ || b:topl =~ '^# -\*- coding: robot -\*-$' + setlocal filetype=robot + endif +endfunc + +"------------------------------------------------------------------------ +let &cpo=s:cpo_save +" vim700: set fdm=marker: diff --git a/vim/.vim/ftplugin/pentadactyl.vim b/vim/.vim/ftplugin/pentadactyl.vim new file mode 100644 index 0000000..f0ace17 --- /dev/null +++ b/vim/.vim/ftplugin/pentadactyl.vim @@ -0,0 +1,27 @@ +" Vim filetype plugin file +" Language: Pentadactyl configuration file +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Version: 1.1 + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +let s:cpo_save = &cpo +set cpo&vim + +let b:undo_ftplugin = "setl com< cms< fo< ofu< | unlet! b:browsefilter" + +setlocal comments=:\" +setlocal commentstring=\"%s +setlocal formatoptions-=t formatoptions+=croql +setlocal omnifunc=syntaxcomplete#Complete + +if has("gui_win32") && !exists("b:browsefilter") + let b:browsefilter = "Pentadactyl Config Files (*.penta)\t*.penta\n" . + \ "All Files (*.*)\t*.*\n" +endif + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/vim/.vim/ftplugin/robot.vim b/vim/.vim/ftplugin/robot.vim new file mode 100644 index 0000000..c11f3f9 --- /dev/null +++ b/vim/.vim/ftplugin/robot.vim @@ -0,0 +1,100 @@ +"============================================================================= +" File: after/syntax/robot.vim +" Author: Michael Foukarakis +" Version: 0.1 +" Created: Fri 17 Dec 2010 11:31:46 AM EET +" Last Update: Wed Dec 10, 2014 12:39 EET +"------------------------------------------------------------------------ +" Description: +" Syntax file for Robot test framework files. +" +"------------------------------------------------------------------------ +" Installation: +" Drop this file into {rtp}/after/syntax +" Requires Vim 7+ +" History: +" 0.1 - Robot now has a standard library, containing all sorts of goodies. +" TODO: +" * Links look OK in most of my colorschemes, but your opinions are +" more than welcome. +" * Fix word boundaries for numbers. +" * Figure out a neater alternative for the monster path regex +" * Robot has no syntax spec :( +"============================================================================= +let s:cpo_save=&cpo +set cpo&vim +"------------------------------------------------------------------------ +" Matches +"------------------------------------------------------------------------ +syn match robotNumber display "\<\d\+\>" +syn match robotEllipsis display "\.\.\." +" Special (escaped) character as defined in Robot's syntax. +syn match robotSpecial display "\\\(\${.*}\|\\\|#\|[n|r|t]\)" +" As variables may be used next to each other, do a non-greedy match. +" Alternatively, match only alphanumeric chars inside brackets. +syn match robotVariable "\(\$\|@\){.\{-}}" +" This is actually NSN specific, keep/change/delete it at will. +" syn match robotTestCaseName "^NG\d\+[ \|\n\|\t]" +" This is by far the most stupid regex you'll see in here.. +syn match robotPath display "\(\.\{1,2}\/\)\=\(\(\h\|\d\)\+\/\)\+\(\(\h\|\d\)\+\.\h\+\)\{,1}$" +" Operators +syn match robotOperator "==\|=" +" Table headers +syn match robotTable "\c^\(\*\+\)\s*\(settings\|variables\|test cases\|\(user \)\?keywords\)\s*\1$" +" Builtins +syn match robotBuiltin "\c\<\(Call Method\|Catenate\|Comment\>\|Convert To Boolean\|Convert To Integer\|Convert To Number\|Convert To String\|Create List\|Evaluate\|Exit For Loop\|Fail\>\|Fatal Error\|Get Count\>\|Get Length\|Get Library Instance\|Get Time\|Get Variables\|Import Library\|Import Resource\|Import Variables\|Length Should Be\|Log Many\|Log Variables\|Log\|No Operation\|Regexp Escape\|Remove Tags\|Repeat Keyword\|Replace Variables\|Run Keyword And Continue On Failure\|Run Keyword And Expect Error\|Run Keyword And Ignore Error\|Run Keyword If All Critical Tests Passed\|Run Keyword If All Tests Passed\|Run Keyword If Any Critical Tests Failed\|Run Keyword If Any Tests Failed\|Run Keyword If Test Failed\|Run Keyword If Test Passed\|Run Keyword If Timeout Occurred\|Run Keyword If\|Run Keyword Unless\|Run Keywords\|Run Keyword\|Set Global Variable\|Set Library Search Order\|Set Log Level\|Set Suite Variable\|Set Tags\|Set Test Message\|Set Test Variable\|Set Variable If\|Set Variable\|Should Be Empty\|Should Be Equal As Integers\|Should Be Equal As Numbers\|Should Be Equal As Strings\|Should Be Equal\|Should Be True\|Should Contain X Times\|Should Contain\|Should End With\|Should Match Regexp\|Should Match\|Should Not Be Empty\|Should Not Be Equal As Integers\|Should Not Be Equal As Numbers\|Should Not Be Equal As Strings\|Should Not Be Equal\|Should Not Be True\|Should Not Contain\|Should Not End With\|Should Not Match Regexp\|Should Not Match\|Should Not Start With\|Should Start With\|Sleep\|Variable Should Exist\|Variable Should Not Exist\|Wait Until Keyword Succeeds\)\>" +" Common settings +syn match robotCommonSet "\c\[\(Documentation\|Timeout\)\]" +" Keyword settings +syn match robotKeywordSet "\c\[\(Arguments\|Return\)\]" +" Testcase settings +syn match robotTestcaseSet "\c\[\(Tags\|Setup\|Teardown\|Precondition\|Postcondition\|Template\)\]" +" Robot Gherkin support +syn match robotGherkin "\c\<\(Given\|When\|Then\|And\|But\)\>" + +" Settings (global) +syn match robotSetup "\c\(Suite\|Test\) \(Setup\|Teardown\|Precondition\|Postcondition\)" +syn match robotSettings "\c\<\(Library\|Resource\|Variables\|Documentation\|Metadata\|Force Tags\|Default Tags\|Test Template\|Test Timeout\)\>" +" Standard library +syn match robotStdlib "\c\(Replace String\|Replace String Using Regexp\)" " TODO +" Other libraries (Selenium) +syn match seleniumLibrary "\c\<\(Add Location Strategy\|Alert Should Be Present\|Assign Id To Element\|Call Selenium Api\|Capture Page Screenshot\|Capture Screenshot\|Checkbox Should Be Selected\|Checkbox Should Not Be Selected\|Choose Cancel On Next Confirmation\|Choose File\|Click Button\|Click Element\|Click Flex Element\|Click Image\|Click Link\|Close All Browsers\|Close Browser\|Close Window\|Confirm Action\|Current Frame Contains\|Current Frame Should Contain\|Delete All Cookies\|Delete Cookie\|Double Click Element\|Double Click Flex Element\|Drag And Drop\|Element Should Be Disabled\|Element Should Be Enabled\|Element Should Be Visible\|Element Should Contain\|Element Should Not Be Visible\|Element Text Should Be\|Execute Javascript\|Flex Element Property Should Be\|Flex Element Should Exist\|Flex Element Should Not Exist\|Flex Element Text Should Be\|Focus\|Frame Should Contain Text\|Frame Should Contain\|Get Alert Message\|Get All Links\|Get Cookie Value\|Get Cookies\|Get Element Attribute\|Get Horizontal Position\|Get List Items\|Get Location\|Get Matching Xpath Count\|Get Source\|Get Table Cell\|Get Text\|Get Title\|Get Value\|Get Vertical Position\|Get Window Identifiers\|Get Window Names\|Get Window Titles\|Go Back\|Go To\|Input Password\|Input Text Into Flex Element\|Input Text\|List Selection Should Be\|List Should Have No Selections\|Location Should Be\|Location Should Contain\|Log Source\|Maximize Browser Window\|Mouse Down On Image\|Mouse Down On Link\|Mouse Down\|Mouse Out\|Mouse Over\|Mouse Up\|Open Browser\|Open Context Menu\|Page Should Contain Button\|Page Should Contain Checkbox\|Page Should Contain Element\|Page Should Contain Image\|Page Should Contain Link\|Page Should Contain List\|Page Should Contain Radio Button\|Page Should Contain Textfield\|Page Should Contain\|Page Should Not Contain Button\|Page Should Not Contain Checkbox\|Page Should Not Contain Element\|Page Should Not Contain Image\|Page Should Not Contain Link\|Page Should Not Contain List\|Page Should Not Contain Radio Button\|Page Should Not Contain Textfield\|Page Should Not Contain\|Press Key Native\|Press Key\|Radio Button Should Be Set To\|Radio Button Should Not Be Selected\|Register Keyword To Run On Failure\|Reload Page\|Select All From List\|Select Checkbox\|Select Flex Application\|Select Frame\|Select From Flex Element\|Select From List\|Select Radio Button\|Select Window\|Set Selenium Speed\|Set Selenium Timeout\|Simulate\|Start Selenium Server\|Stop Selenium Server\|Submit Form\|Switch Browser\|Table Cell Should Contain\|Table Column Should Contain\|Table Footer Should Contain\|Table Header Should Contain\|Table Row Should Contain\|Table Should Contain\|Textfield Should Contain\|Textfield Value Should Be\|Title Should Be\|Unselect Checkbox\|Unselect Frame\|Unselect From List\|Wait For Condition\|Wait For Flex Element\|Wait Until Page Contains Element\|Wait Until Page Contains\|Wait Until Page Loaded\|Xpath Should Match X Times\)\>" + +"------------------------------------------------------------------------ +" Regions +"------------------------------------------------------------------------ +" Single-line comments. Are there multi-line comments? +syn region robotComment display start="^#" excludenl end="$" +syn region robotString start="\"" excludenl end="\"" + +"------------------------------------------------------------------------ +" Keywords +"------------------------------------------------------------------------ + +"------------------------------------------------------------------------ +" Links +"------------------------------------------------------------------------ +hi def link robotVariable Type +hi def link robotSetup Include +hi def link robotSettings Include +hi def link robotTestCaseName Function +hi def link robotComment Comment +hi def link robotEllipsis String +hi def link robotTable Identifier +hi def link robotImport Include +hi def link robotSpecial Special +hi def link robotString String +hi def link robotNumber Number +hi def link robotPath Constant +hi def link robotOperator Operator +hi def link robotBuiltin Comment +hi def link robotCommonSet Keyword +hi def link robotKeywordSet Keyword +hi def link robotTestcaseSet Keyword +hi def link robotGherkin Keyword +hi def link seleniumLibrary Keyword + +let b:current_syntax = "robot" +"------------------------------------------------------------------------ +let &cpo=s:cpo_save +" vim600: set fdm=marker: diff --git a/vim/.vim/syntax/fsm_syslog.vim b/vim/.vim/syntax/fsm_syslog.vim new file mode 100644 index 0000000..8ca21cc --- /dev/null +++ b/vim/.vim/syntax/fsm_syslog.vim @@ -0,0 +1,45 @@ +" Vim syntax file +" Language: FSM syslog files coloring +" Maintainer: Piotr Rotter piotr.rotter@nsn.com + +if version < 600 + syntax clear +elseif exists("b:current_syntax") + finish +endif + +let s:cpo_save = &cpo +set cpo&vim + +syn keyword gpsd_related gpsd +syn match PPS_clk_event_timeout "PPS clk event timeout" +syn match PPS_clk_event_failure "PPS clk event failure" +syn match PPS_clk_event_arrived "PPS clk event arrived" + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_basic_syntax_inits") + if version < 508 + let did_fsm_syslog_syntax_inits = 1 + command -nargs=+ HiLink hi link <args> + else + command -nargs=+ HiLink hi def link <args> + endif + + HiLink gpsd_related Type + HiLink PPS_clk_event_timeout Number + HiLink PPS_clk_event_failure Error + HiLink PPS_clk_event_arrived Special + + HiLink basicFilenumber basicTypeSpecifier + "hi basicMathsOperator term=bold cterm=bold gui=bold + + delcommand HiLink +endif + +let b:current_syntax = "fsm_syslog" + +let &cpo = s:cpo_save +unlet s:cpo_save +" vim: ts=8 diff --git a/vim/.vim/syntax/pentadactyl.vim b/vim/.vim/syntax/pentadactyl.vim new file mode 100644 index 0000000..f32371c --- /dev/null +++ b/vim/.vim/syntax/pentadactyl.vim @@ -0,0 +1,133 @@ +" Vim syntax file +" Language: Pentadactyl configuration file +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Version: 1.1 + +if exists("b:current_syntax") + finish +endif + +let s:cpo_save = &cpo +set cpo&vim + +syn include @javascriptTop syntax/javascript.vim +unlet b:current_syntax + +syn include @cssTop syntax/css.vim +unlet b:current_syntax + +syn match pentadactylCommandStart "\%(^\s*:\=\)\@<=" nextgroup=pentadactylCommand,pentadactylAutoCmd + +syn keyword pentadactylCommand loadplugins lpl gr[oup] ! run Clistk[eys] Clk + \ Cm[ap] Cno[remap] Cunm[ap] Ilistk[eys] Ilk Im[ap] Ino[remap] Iunm[ap] + \ ab[breviate] addo[ns] ao au[tocmd] ba[ck] background bg bd[elete] + \ blistk[eys] blk bm[ap] bma[rk] bmarks bno[remap] b[uffer] buffers files ls + \ tabs bunm[ap] ca[bbreviate] caretlistk[eys] caretlk caretm[ap] + \ caretno[remap] caretunm[ap] cd chd[ir] clistk[eys] clk cm[ap] cno[remap] + \ colo[rscheme] com[mand] comp[letions] contexts cookies ck cuna[bbreviate] + \ cunm[ap] delbm[arks] delc[ommand] delg[roup] delmac[ros] delm[arks] + \ delqm[arks] dels[tyle] dia[log] dlc[lear] doautoa[ll] do[autocmd] + \ downl[oads] dl ec[ho] echoe[rr] echom[sg] el[se] elsei[f] elif em[enu] + \ en[dif] fi exe[cute] exit x exta[dd] extde[lete] extrm extd[isable] + \ exte[nable] exto[ptions] extp[references] extr[ehash] extt[oggle] + \ extu[pdate] feedkeys fk fini[sh] fo[rward] fw frameo[nly] ha[rdcopy] + \ h[elp] helpa[ll] hi[ghlight] hist[ory] hs ia[bbreviate] if ilistk[eys] ilk + \ im[ap] ino[remap] iuna[bbreviate] iunm[ap] javas[cript] js ju[mps] + \ keepa[lt] let listc[ommands] lc listk[eys] lk listo[ptions] lo mac[ros] + \ map ma[rk] marks mes[sages] messc[lear] mkp[entadactylrc] mkv[imruntime] + \ mlistk[eys] mlk mm[ap] mno[remap] munm[ap] nlistk[eys] nlk nm[ap] + \ nno[remap] noh[lfind] no[remap] norm[al] nunm[ap] olistk[eys] olk om[ap] + \ ono[remap] o[pen] ounm[ap] pa[geinfo] pagest[yle] pas pin[tab] + \ pref[erences] prefs pr[ivate] pr0n porn pw[d] qma[rk] qmarks q[uit] + \ quita[ll] qa[ll] redr[aw] reg[isters] reh[ash] re[load] reloada[ll] + \ res[tart] runt[ime] sa[nitize] sav[eas] w[rite] sbcl[ose] scrip[tnames] + \ se[t] setg[lobal] setl[ocal] sideb[ar] sb[ar] sbop[en] sil[ent] so[urce] + \ st[op] stopa[ll] sty[le] styled[isable] styd[isable] stylee[nable] + \ stye[nable] stylet[oggle] styt[oggle] tab taba[ttach] tabc[lose] + \ tabde[tach] tabd[o] bufd[o] tabdu[plicate] tabl[ast] bl[ast] tabm[ove] + \ tabn[ext] tn[ext] bn[ext] tabo[nly] tabopen t[open] tabnew tabp[revious] + \ tp[revious] tabN[ext] tN[ext] bp[revious] bN[ext] tabr[ewind] tabfir[st] + \ br[ewind] bf[irst] time tlistk[eys] tlk tm[ap] tno[remap] toolbarh[ide] + \ tbh[ide] toolbars[how] tbs[how] toolbart[oggle] tbt[oggle] tunm[ap] + \ una[bbreviate] u[ndo] undoa[ll] unl[et] unm[ap] unpin[tab] verb[ose] + \ ve[rsion] vie[wsource] vlistk[eys] vlk vm[ap] vno[remap] vunm[ap] + \ winc[lose] wc[lose] wind[ow] winon[ly] wino[pen] wo[pen] wqa[ll] wq xa[ll] + \ y[ank] zo[om] + \ contained + +syn match pentadactylCommand "!" contained + +syn keyword pentadactylAutoCmd au[tocmd] contained nextgroup=pentadactylAutoEventList skipwhite + +syn keyword pentadactylAutoEvent BookmarkAdd BookmarkChange BookmarkRemove + \ ColorScheme DOMLoad DownloadPost Fullscreen LocationChange PageLoadPre + \ PageLoad PrivateMode Sanitize ShellCmdPost Enter LeavePre Leave + \ contained + +syn match pentadactylAutoEventList "\(\a\+,\)*\a\+" contained contains=pentadactylAutoEvent + +syn region pentadactylSet matchgroup=pentadactylCommand start="\%(^\s*:\=\)\@<=\<\%(setl\%[ocal]\|setg\%[lobal]\|set\=\)\=\>" + \ end="$" keepend oneline contains=pentadactylOption,pentadactylString + +syn keyword pentadactylOption activate act altwildmode awim autocomplete au + \ cdpath cd complete cpt cookieaccept ca cookielifetime cl cookies ck + \ defsearch ds downloadsort dlsort dls editor encoding enc eventignore ei + \ extendedhinttags eht fileencoding fenc findcase fc findflags ff + \ followhints fh guioptions go helpfile hf hintinputs hin hintkeys hk + \ hintmatching hm hinttags ht hinttimeout hto history hi iskeyword isk + \ jumptags jt linenumbers ln loadplugins lpl maxitems messages msgs newtab + \ nextpattern pageinfo pa passkeys pk passunknown pu popups pps + \ previouspattern runtimepath rtp sanitizeitems si sanitizeshutdown ss + \ sanitizetimespan sts scroll scr scrollsteps scs scrolltime sct shell sh + \ shellcmdflag shcf showmode smd showstatuslinks ssli showtabline stal + \ spelllang spl strictfocus sf suggestengines timeoutlen tmol titlestring + \ urlseparator urlsep us verbose vbs wildanchor wia wildcase wic wildignore + \ wig wildmode wim wildsort wis wordseparators wsp yankshort ys + \ contained nextgroup=pentadactylSetMod + +let s:toggleOptions = ["banghist", "bh", "errorbells", "eb", "exrc", "ex", + \ "fullscreen", "fs", "hlfind", "hlf", "incfind", "if", "insertmode", "im", + \ "jsdebugger", "jsd", "more", "online", "timeout", "tmo", "usermode", "um", + \ "visualbell", "vb"] +execute 'syn match pentadactylOption "\<\%(no\|inv\)\=\%(' . + \ join(s:toggleOptions, '\|') . + \ '\)\>!\=" contained nextgroup=pentadactylSetMod' + +syn match pentadactylSetMod "\%(\<[a-z_]\+\)\@<=&" contained + +syn region pentadactylJavaScript start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=" end="$" contains=@javascriptTop keepend oneline +syn region pentadactylJavaScript matchgroup=pentadactylJavaScriptDelimiter + \ start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=<<\s*\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@javascriptTop fold + +let s:cssRegionStart = '\%(^\s*sty\%[le]!\=\s\+\%(-\%(n\|name\)\%(\s\+\|=\)\S\+\s\+\)\=[^-]\S\+\s\+\)\@<=' +execute 'syn region pentadactylCss start="' . s:cssRegionStart . '" end="$" contains=@cssTop keepend oneline' +execute 'syn region pentadactylCss matchgroup=pentadactylCssDelimiter' + \ 'start="' . s:cssRegionStart . '<<\s*\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@cssTop fold' + +syn match pentadactylNotation "<[0-9A-Za-z-]\+>" + +syn keyword pentadactylTodo FIXME NOTE TODO XXX contained + +syn region pentadactylString start="\z(["']\)" end="\z1" skip="\\\\\|\\\z1" oneline + +syn match pentadactylComment +^\s*".*$+ contains=pentadactylTodo,@Spell + +" NOTE: match vim.vim highlighting group names +hi def link pentadactylAutoCmd pentadactylCommand +hi def link pentadactylAutoEvent Type +hi def link pentadactylCommand Statement +hi def link pentadactylJavaScriptDelimiter Delimiter +hi def link pentadactylCssDelimiter Delimiter +hi def link pentadactylNotation Special +hi def link pentadactylComment Comment +hi def link pentadactylOption PreProc +hi def link pentadactylSetMod pentadactylOption +hi def link pentadactylString String +hi def link pentadactylTodo Todo + +let b:current_syntax = "pentadactyl" + +let &cpo = s:cpo_save +unlet s:cpo_save + +" vim: tw=130 et ts=8 sts=4 sw=4: diff --git a/vim/.viminfo b/vim/.viminfo new file mode 100644 index 0000000..bf0a75b --- /dev/null +++ b/vim/.viminfo @@ -0,0 +1,299 @@ +# This viminfo file was generated by Vim 7.3. +# You may edit it if you're careful! + +# Value of 'encoding' when this file was written +*encoding=utf-8 + + +# hlsearch on (H) or off (h): +~h +# Last Search Pattern: +~MSle0~/parent + +# Last Substitute String: +$ + +# Command Line History (newest to oldest): +:q +:q! +:wq +:retab! +:Q +:edit ../ddgtopsl/maiatree +:w +:set background=dark +:edit ../devtree_old/src-fsmddg/src/rf-asic/rf-asic.c +:e +:edit maia0.dts +:resize +:edit ../../../../src-fsmddg/src/udev/scripts/ddal_fpga.sh +:edit . +:edit +:edit +:edit ~/.bash/completion/build.bash +:edit ~/sinppet.bash +:W +:set noexpandtab + +# Search String History (newest to oldest): +? ^\d\{3}ÿ +?/parent +?/compatible +?/interrupts +?/ows +?/9 8 +?/probe +?/DRIVERNAME +?/standard +?/interrupt +?/rf-asic +?/mddg +?/\vsample +?/sample +?/1409 +?/49 +?/platform_driver +?/major +?/pdev +?/s + +# Expression History (newest to oldest): + +# Input Line History (newest to oldest): + +# Input Line History (newest to oldest): + +# Registers: +"0 CHAR 0 + 9 +""1 LINE 0 + [push] + default = simple +"2 LINE 0 + Module to read in the input pins of several PCF8574 I/O converters + +"3 LINE 0 + +"4 LINE 0 + +"5 LINE 0 + int new_irq = 0; +"6 LINE 0 + +"7 LINE 0 + alias ll=$l +"8 LINE 0 + +"9 LINE 0 + +"a@ CHAR 0 + 0eld$j +"- CHAR 0 + 9 + +# File marks: +'0 1 0 /build/home/msobkows/maia_dt_unchanged/bld-fsmfirmware-fct/results/fpga_version_list_part +'1 3 0 ~/dotfiles/files/gitconfig +'2 3 1 ~/.gitconfig +'3 124 2 ~/.bashrc +'4 87 4 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +'5 88 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +'6 25 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +'7 1 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/Makefile +'8 1 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/Kbuild +'9 87 2 /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia0.dts + +# Jumplist (newest first): +-' 1 0 /build/home/msobkows/maia_dt_unchanged/bld-fsmfirmware-fct/results/fpga_version_list_part +-' 3 0 ~/dotfiles/files/gitconfig +-' 1 0 ~/dotfiles/files/gitconfig +-' 3 1 ~/.gitconfig +-' 124 2 ~/.bashrc +-' 1 0 ~/.gitconfig +-' 87 4 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 374 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 85 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 88 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 133 18 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 25 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 80 6 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 103 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 1 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 99 4 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 1 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/Makefile +-' 1 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/Kbuild +-' 87 2 /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia0.dts +-' 86 2 /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia0.dts +-' 42 2 /build/home/msobkows/maia_dt_unchanged/src-ddg/src/dtb/maia/hexfiles/MAIA_FLv1/maia0_k3.dts +-' 1 0 /build/home/msobkows/maia_dt_unchanged/src-ddg/src/dtb/maia/hexfiles/MAIA_FLv1/maia0_k3.dts +-' 8 0 /build/home/msobkows/maia_dt_unchanged/src-ddg/src/dtb +-' 1 0 /build/home/msobkows/maia_dt_unchanged/src-ddg/src/dtb +-' 61 9 /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/mera/hexfiles/MERA_FLv1/mera0.dts +-' 1 0 /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/mera/hexfiles/MERA_FLv1/mera0.dts +-' 74 12 /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia1.dts +-' 55 2 /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia1.dts +-' 106 12 /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia1.dts +-' 17 0 /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia1.dts +-' 73 2 /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia1.dts +-' 114 0 /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia0.dts +-' 73 2 /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia0.dts +-' 35 48 /build/home/msobkows/drivers_learning/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia0.dts +-' 74 24 /build/home/msobkows/drivers_learning/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia0.dts +-' 43 16 /build/home/msobkows/drivers_learning/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia0.dts +-' 37 55 /build/home/msobkows/drivers_learning/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia0.dts +-' 2 1 /build/home/msobkows/drivers_learning/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia0.dts +-' 5 1 /build/home/msobkows/drivers_learning/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia0.dts +-' 22 9 /build/home/msobkows/drivers_learning/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia0.dts +-' 1 0 /build/home/msobkows/drivers_learning/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia0.dts +-' 8 0 /build/home/msobkows/drivers_learning/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1 +-' 1 0 /build/home/msobkows/drivers_learning/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1 +-' 7 19 ~/.tmux.conf +-' 22 0 ~/.tmux.conf +-' 10 0 ~/.tmux.conf +-' 252 4 /build/home/msobkows/device_tree_test/src-fsmddg/src/rf-asic/rf-asic.c +-' 277 5 /build/home/msobkows/device_tree_test/src-fsmddg/src/rf-asic/rf-asic.c +-' 1 0 ~/.tmux.conf +-' 4 15 ~/.bash/aliases/generic.bash +-' 3 0 ~/.bash/aliases/generic.bash +-' 85 0 ~/.bashrc +-' 1 0 ~/.bashrc +-' 50 0 /build/home/msobkows/device_tree_test/src-fsmddg/src/synceth/zl30142.c +-' 1 0 /build/home/msobkows/device_tree_test/src-fsmddg/src/synceth/zl30142.c +-' 41 2 /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia1.dts +-' 1 0 /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia1.dts +-' 1 0 /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia0.dts +-' 49 0 /build/home/msobkows/maia_investigation/ddgtopsl/maiatree +-' 1 0 /build/home/msobkows/maia_investigation/fixeddriver/maiatree +-' 283 0 /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/pa-temp.c +-' 238 0 /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/pa-temp.c +-' 73 29 /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/pa-temp.c +-' 37 27 /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/pa-temp.c +-' 32 8 /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/pa-temp.c +-' 1 0 /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/pa-temp.c +-' 324 0 /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/pa-temp.c +-' 280 0 /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/rf-asic.c +-' 275 0 /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/rf-asic.c +-' 43 16 /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/rf-asic.c +-' 28 49 /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/rf-asic.c +-' 27 27 /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/rf-asic.c +-' 26 27 /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/rf-asic.c +-' 1 0 /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/rf-asic.c +-' 380 0 /build/home/msobkows/maia_investigation/ddgtopsl/messages +-' 379 112 /build/home/msobkows/maia_investigation/ddgtopsl/messages +-' 377 72 /build/home/msobkows/maia_investigation/ddgtopsl/messages +-' 376 72 /build/home/msobkows/maia_investigation/ddgtopsl/messages +-' 375 72 /build/home/msobkows/maia_investigation/ddgtopsl/messages +-' 373 72 /build/home/msobkows/maia_investigation/ddgtopsl/messages +-' 372 72 /build/home/msobkows/maia_investigation/ddgtopsl/messages +-' 371 112 /build/home/msobkows/maia_investigation/ddgtopsl/messages +-' 1 0 ~/dotfiles/.gitconfig +-' 124 2 ~/dotfiles/bashrc +-' 207 6 ~/dotfiles/bashrc +-' 169 6 ~/dotfiles/bashrc +-' 174 0 ~/dotfiles/bashrc +-' 1 0 ~/dotfiles/bashrc +-' 51 0 ~/dotfiles/bashrc +-' 1 0 ~/dotfiles/vimrc +-' 89 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 134 18 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 81 6 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 104 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 100 4 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 375 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c +-' 1 0 /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/Makefile + +# History of marks within files (newest to oldest): + +> /build/home/msobkows/maia_dt_unchanged/bld-fsmfirmware-fct/results/fpga_version_list_part + " 1 0 + +> ~/dotfiles/files/gitconfig + " 3 0 + +> ~/.gitconfig + " 3 1 + . 4 0 + + 4 0 + +> ~/.bashrc + " 124 2 + . 188 0 + + 188 0 + +> /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/mddg_pcf8574_in.c + " 87 4 + ^ 31 4 + . 31 4 + + 26 0 + + 25 0 + + 25 0 + + 31 4 + +> ~/dotfiles/.gitconfig + " 1 0 + +> ~/dotfiles/bashrc + " 124 2 + +> ~/dotfiles/vimrc + " 1 0 + +> ~/.vimrc + " 1 0 + +> /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/rf-asic.h + " 70 16 + +> /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/rf-asic/rf-asic.c + " 280 5 + . 277 0 + + 276 0 + + 277 0 + + 278 0 + + 279 0 + + 276 0 + + 277 0 + + 278 0 + + 279 0 + + 282 0 + + 257 15 + + 49 21 + + 277 5 + + 277 52 + + 277 0 + + 257 0 + + 255 0 + + 277 0 + +> /build/home/msobkows/maia_dt_unchanged/src-kernelsources/src/patches/301_sdk_adaptation.patch + " 1359 7 + +> /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/dtb/fsmddg_dtb_main.c + " 397 1 + +> /build/home/msobkows/maia_dt_unchanged/src-fsmddg/src/fsoc_dtb/fqea_fsoc.dts + " 352 0 + +> /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia0.dts + " 73 16 + ^ 73 17 + . 73 16 + + 73 16 + +> /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/Makefile + " 1 0 + +> /build/home/msobkows/drivers_learning/src-mddg/src/pcf8574/Kbuild + " 1 0 + +> /build/home/msobkows/maia_dt_unchanged/src-ddg/src/dtb/maia/hexfiles/MAIA_FLv1/maia0_k3.dts + " 42 2 + +> /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/mera/hexfiles/MERA_FLv1/mera0.dts + " 61 9 + +> /build/home/msobkows/maia_dt_unchanged/src-fsmpsl/src/maia/hexfiles/MAIA_FLv1/maia1.dts + " 74 12 + ^ 73 17 + . 73 17 + + 73 17 diff --git a/vim/.vimrc b/vim/.vimrc new file mode 100644 index 0000000..06f69ac --- /dev/null +++ b/vim/.vimrc @@ -0,0 +1,218 @@ +" Vim configuration +" +" ============================================================================= +" Vim-plug setup +" ============================================================================= +call plug#begin() +Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } +Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' +Plug 'christoomey/vim-tmux-navigator' +Plug 'vim-scripts/cscope.vim' +Plug 'bling/vim-airline' +Plug 'chriskempson/base16-vim' +Plug 'jlanzarotta/bufexplorer' +Plug 'rking/ag.vim' +call plug#end() + +set nocompatible +set ttyfast + +" ============================================================================= +" External configuration +" ============================================================================= + +" enable modeline in files +set modeline +" allow local .vimrc files but use only safe options +set exrc +set secure + +" ============================================================================= +" Colorscheme +" ============================================================================= + +set t_Co=256 +let base16colorspace=256 " Access colors present in 256 colorspace +colorscheme base16-eighties +set background=dark + +syntax on +" highlight matching brackets +set showmatch + +" ============================================================================= +" Interface +" ============================================================================= + +set cursorline +set number +set wildmenu +set relativenumber +set shortmess=atI +set laststatus=2 + +" leader r to toggle relative line numbers +nmap <leader>r :set rnu!<CR> + +nnoremap ; : +nnoremap : ; +vnoremap ; : +vnoremap : ; + +" ============================================================================= +" Indentation +" ============================================================================= + +set tabstop=8 +set softtabstop=8 +set shiftwidth=8 +set noexpandtab + +filetype plugin indent on + +" ============================================================================= +" Invisible characters +" ============================================================================= + +nmap <leader>l :set list!<CR> +set listchars=tab:▸\ ,eol:¬ + +function! Preserve(command) + + " Save last search and cursor position + let _s=@/ + let l = line(".") + let c = col(".") + + execute a:command + + " Restore search history and cursor position + let @/=_s + call cursor(l, c) + +endfunction +nmap _$ :call Preserve("%s/\\s\\+$//e")<CR> + +" ============================================================================= +" Buffers +" ============================================================================= + +" Auto hide buffers without raising error +set hidden + +" ============================================================================= +" Navigation mappings +" ============================================================================= + +" better window navigation +map <C-h> <C-w>h +map <C-j> <C-w>j +map <C-k> <C-w>k +map <C-l> <C-w>l + +" disable arrow keys +map <up> <nop> +map <down> <nop> +map <left> <nop> +map <right> <nop> +imap <up> <nop> +imap <down> <nop> +imap <left> <nop> +imap <right> <nop> + +" better scrolling within wrapped lines +nnoremap j gj +nnoremap k gk + +" leader r to toggle relative line numbers +nmap <leader>r ;set rnu!<CR> + +set pastetoggle=<F11> + +" ============================================================================= +" Search +" ============================================================================= + +set hlsearch +nnoremap <leader><space> :noh<cr> + +set incsearch +set smartcase + +" use g flag by default +set gdefault +" very magic regular expressions +nnoremap / /\v +vnoremap / /\v + +" ============================================================================= +" Temporary/backup/undo files +" ============================================================================= + +" save backups to .vim-backup directory in pwd (if exists), if not, then at +" ~/.vim/backup +if isdirectory($HOME . '/.vim/backup') == 0 + :silent !mkdir -p ~/.vim/backup >/dev/null 2>&1 +endif +set backupdir-=. +set backupdir+=. +set backupdir-=~/ +set backupdir^=~/.vim/backup +set backupdir^=./.vim-backup +set backup + +" do simmilar thing for swap files +if isdirectory($HOME . '/.vim/swap') == 0 + :silent !mkdir -p ~/.vim/swap >/dev/null 2>&1 +endif +set directory=./.vim-swap// +set directory+=~/.vim/swap// + +" and for undo files +if exists("+undofile") + if isdirectory($HOME . '/vim/undo') == 0 + :silent !mkdir -p ~/.vim/undo >/dev/null 2>&1 + endif + set undodir=./.vim-undo// + set undodir+=~/.vim/undo// + set undofile +endif + +set viminfo+=n~/.vim/viminfo + +" ============================================================================= +" Scrolling +" ============================================================================= + +set scrolloff=10 + + +" ============================================================================= +" Cscope +" ============================================================================= +" +nnoremap <leader>fa :call cscope#findInteractive(expand('<cword>'))<CR> +nnoremap <leader>l :call ToggleLocationList()<CR> +" s: Find this C symbol +nnoremap <leader>fs :call cscope#find('s', expand('<cword>'))<CR> +" g: Find this definition +nnoremap <leader>fg :call cscope#find('g', expand('<cword>'))<CR> +" d: Find functions called by this function +nnoremap <leader>fd :call cscope#find('d', expand('<cword>'))<CR> +" c: Find functions calling this function +nnoremap <leader>fc :call cscope#find('c', expand('<cword>'))<CR> +" t: Find this text string +nnoremap <leader>ft :call cscope#find('t', expand('<cword>'))<CR> +" e: Find this egrep pattern +nnoremap <leader>fe :call cscope#find('e', expand('<cword>'))<CR> +" f: Find this file +nnoremap <leader>ff :call cscope#find('f', expand('<cword>'))<CR> +" i: Find files #including this file +nnoremap <leader>fi :call cscope#find('i', expand('<cword>'))<CR> + + +" ============================================================================= +" Plugins configuration +" ============================================================================= +" +let g:airline_powerline_fonts = 1 |